Skip to content

Commit 0616cbc

Browse files
committed
Upgraded JSP build dependency to 2.2
1 parent fbdebc1 commit 0616cbc

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ project("spring-beans") {
268268
dependencies {
269269
compile(project(":spring-core"))
270270
compile(files(project(":spring-core").cglibRepackJar))
271-
optional("javax.el:javax.el-api:2.2.4")
272271
optional("javax.inject:javax.inject:1")
272+
optional("javax.el:javax.el-api:2.2.4")
273273
testCompile("log4j:log4j:1.2.17")
274274
}
275275
}
@@ -540,7 +540,7 @@ project("spring-web") {
540540
compile(project(":spring-core"))
541541
provided("javax.servlet:javax.servlet-api:3.0.1")
542542
optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
543-
optional("javax.servlet.jsp:jsp-api:2.1")
543+
optional("javax.servlet.jsp:jsp-api:2.2")
544544
optional("javax.portlet:portlet-api:2.0")
545545
optional("javax.el:javax.el-api:2.2.4")
546546
optional("javax.faces:javax.faces-api:2.2")
@@ -664,7 +664,7 @@ project("spring-webmvc") {
664664
provided("javax.servlet:javax.servlet-api:3.0.1")
665665
optional(project(":spring-context-support")) // for Velocity support
666666
optional(project(":spring-oxm")) // for MarshallingView
667-
optional("javax.servlet.jsp:jsp-api:2.1")
667+
optional("javax.servlet.jsp:jsp-api:2.2")
668668
optional("javax.servlet:jstl:1.2")
669669
optional("net.sourceforge.jexcelapi:jxl:2.6.12")
670670
optional("org.apache.poi:poi:3.9")
@@ -733,7 +733,7 @@ project("spring-webmvc-tiles3") {
733733
provided(project(":spring-context"))
734734
provided(project(":spring-web"))
735735
provided("javax.servlet:javax.servlet-api:3.0.1")
736-
optional("javax.servlet.jsp:jsp-api:2.1")
736+
optional("javax.servlet.jsp:jsp-api:2.2")
737737
optional("javax.servlet:jstl:1.2")
738738
optional("javax.el:javax.el-api:2.2.4")
739739
optional("org.apache.tiles:tiles-request-api:1.0.1")
@@ -793,9 +793,10 @@ project("spring-test") {
793793
optional("org.testng:testng:6.8.8")
794794
optional("javax.inject:javax.inject:1")
795795
optional("javax.servlet:javax.servlet-api:3.0.1")
796-
optional("javax.servlet.jsp:jsp-api:2.1")
796+
optional("javax.servlet.jsp:jsp-api:2.2")
797797
optional("javax.servlet:jstl:1.2")
798798
optional("javax.portlet:portlet-api:2.0")
799+
optional("javax.el:javax.el-api:2.2.4")
799800
optional("org.eclipse.persistence:javax.persistence:2.0.0")
800801
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
801802
optional("org.hamcrest:hamcrest-core:1.3")

0 commit comments

Comments
 (0)