Browse Source

Upgrade to Servlet API 4.0.1

pull/1837/head
Juergen Hoeller 8 years ago
parent
commit
2008e04354
  1. 4
      spring-test/spring-test.gradle
  2. 4
      spring-webmvc/spring-webmvc.gradle

4
spring-test/spring-test.gradle

@ -28,7 +28,7 @@ dependencies { @@ -28,7 +28,7 @@ dependencies {
optional("javax.activation:activation:1.1.1")
optional("javax.el:javax.el-api:3.0.1-b04")
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.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.xml.bind:jaxb-api:2.3.0")
@ -81,9 +81,9 @@ dependencies { @@ -81,9 +81,9 @@ dependencies {
exclude group: "commons-logging", module: "commons-logging"
}
testCompile('io.projectreactor.ipc:reactor-netty')
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
// Pull in the latest JUnit 5 Launcher API and the Vintage engine as well
// so that we can run JUnit 4 tests in IntelliJ IDEA.
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")

4
spring-webmvc/spring-webmvc.gradle

@ -13,7 +13,7 @@ dependencyManagement { @@ -13,7 +13,7 @@ dependencyManagement {
}
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-beans"))
compile(project(":spring-context"))
@ -47,7 +47,7 @@ dependencies { @@ -47,7 +47,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
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}") {
exclude group: "javax.servlet", module: "javax.servlet"
}

Loading…
Cancel
Save