root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to Servlet API 4.0.1 (aligned with Tomcat 9 and Undertow 2) 

Issue: SPR-16470
This commit is contained in:
Juergen Hoeller 2018-05-07 14:17:28 +02:00
parent 3917737df2
commit 53aa9cc4cd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/spring-messaging.gradle
View File

@ -26,7 +26,7 @@ dependencies {
optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}") optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
optional("javax.xml.bind:jaxb-api:2.3.0") optional("javax.xml.bind:jaxb-api:2.3.0")
testCompile("javax.inject:javax.inject-tck:1") testCompile("javax.inject:javax.inject-tck:1")
testCompile("javax.servlet:javax.servlet-api:3.1.0") testCompile("javax.servlet:javax.servlet-api:4.0.1")
testCompile("javax.validation:validation-api:1.1.0.Final") testCompile("javax.validation:validation-api:1.1.0.Final")
testCompile("com.thoughtworks.xstream:xstream:1.4.10") testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("org.apache.activemq:activemq-broker:5.8.0") testCompile("org.apache.activemq:activemq-broker:5.8.0")

2
spring-test/spring-test.gradle
View File

@ -28,7 +28,7 @@ dependencies {
optional("javax.activation:activation:1.1.1") optional("javax.activation:activation:1.1.1")
optional("javax.el:javax.el-api:3.0.1-b04") optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.inject:javax.inject:1") optional("javax.inject:javax.inject:1")
optional("javax.servlet:javax.servlet-api:4.0.0") optional("javax.servlet:javax.servlet-api:4.0.1")
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02") optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1") optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.xml.bind:jaxb-api:2.3.0") optional("javax.xml.bind:jaxb-api:2.3.0")

2
spring-webflux/spring-webflux.gradle
View File

@ -20,7 +20,7 @@ dependencies {
compile("io.projectreactor:reactor-core") compile("io.projectreactor:reactor-core")
optional(project(":spring-context")) optional(project(":spring-context"))
optional(project(":spring-context-support")) // for FreeMarker support optional(project(":spring-context-support")) // for FreeMarker support
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:4.0.1")
optional("javax.websocket:javax.websocket-api:1.1") optional("javax.websocket:javax.websocket-api:1.1")
optional("org.webjars:webjars-locator-core:0.35") optional("org.webjars:webjars-locator-core:0.35")
optional("org.freemarker:freemarker:${freemarkerVersion}") optional("org.freemarker:freemarker:${freemarkerVersion}")

4
spring-webmvc/spring-webmvc.gradle
View File

@ -13,7 +13,7 @@ dependencyManagement {
} }
dependencies { dependencies {
provided("javax.servlet:javax.servlet-api:4.0.0") provided("javax.servlet:javax.servlet-api:4.0.1")
compile(project(":spring-aop")) compile(project(":spring-aop"))
compile(project(":spring-beans")) compile(project(":spring-beans"))
compile(project(":spring-context")) compile(project(":spring-context"))
@ -47,7 +47,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}") optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional("org.reactivestreams:reactive-streams") optional("org.reactivestreams:reactive-streams")
testCompile("javax.servlet:javax.servlet-api:4.0.0") testCompile("javax.servlet:javax.servlet-api:4.0.1")
testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") { testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
exclude group: "javax.servlet", module: "javax.servlet" exclude group: "javax.servlet", module: "javax.servlet"
} }

2
spring-websocket/spring-websocket.gradle
View File

@ -19,7 +19,7 @@ dependencies {
compile(project(":spring-web")) compile(project(":spring-web"))
optional(project(":spring-messaging")) optional(project(":spring-messaging"))
optional(project(":spring-webmvc")) optional(project(":spring-webmvc"))
optional("javax.servlet:javax.servlet-api:3.1.0") optional("javax.servlet:javax.servlet-api:4.0.1")
optional("javax.websocket:javax.websocket-api:1.1") optional("javax.websocket:javax.websocket-api:1.1")
optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") { optional("org.apache.tomcat:tomcat-websocket:${tomcatVersion}") {
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"