From 96f27501b1e27277cfe7202694d1d122e66a0e20 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 Mar 2017 17:35:29 +0000 Subject: [PATCH] Align EL API dependency with Spring Framework 5 Upgrade to 3.0.1-b04. The implementation dependency, tomcat-jasper-el, has also been upgraded so that it implements the 3.0 API. Lastly, the EL API dependency has been marked as compileOnly to prevent conflicts with the API classes that are pulled in transitively by tomcat-jasper-el. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ec351938..16683fe1 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ subprojects { subproject -> compile("org.springframework:spring-core:$springVersion") compile("org.springframework:spring-expression:$springVersion") compile("commons-logging:commons-logging:1.2") - provided("javax.el:javax.el-api:2.2.5") + compileOnly("javax.el:javax.el-api:3.0.1-b04") testCompile("junit:junit:4.12") { exclude group:'org.hamcrest', module:'hamcrest-core' } @@ -86,7 +86,7 @@ subprojects { subproject -> testCompile("org.easymock:easymock:3.4") testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}") testRuntime("org.apache.logging.log4j:log4j-jcl:${log4jVersion}") - testCompile("org.apache.tomcat:tomcat-jasper-el:7.0.69") + testCompile("org.apache.tomcat:tomcat-jasper-el:8.5.11") } tasks.withType(Test).all {