From e0c56a124ab47b8b2aa0415c7b0ab32c20c76821 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 28 Mar 2013 21:55:47 +0100 Subject: [PATCH] Consistently refer to most recent version of javax.el, in order to be compatible with Hibernate Validator 5.0 when doing integration tests Issue: SPR-8199 --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index b9768d3506..4f5e40bc3d 100644 --- a/build.gradle +++ b/build.gradle @@ -247,7 +247,7 @@ project("spring-beans") { dependencies { compile(project(":spring-core")) compile(files(project(":spring-core").cglibRepackJar)) - provided("javax.el:el-api:1.0") + provided("javax.el:javax.el-api:2.2.4") provided("javax.inject:javax.inject:1") testCompile("log4j:log4j:1.2.17") } @@ -305,12 +305,12 @@ project("spring-context") { optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0-b06") optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1") optional("org.eclipse.persistence:javax.persistence:2.0.0") - optional("javax.validation:validation-api:1.0.0.GA") optional("org.beanshell:bsh:2.0b4") optional("org.codehaus.groovy:groovy-all:1.8.8") optional("org.jruby:jruby:1.6.5.1") optional("joda-time:joda-time:2.1") optional("org.slf4j:slf4j-api:${slf4jVersion}") + optional("javax.validation:validation-api:1.0.0.GA") optional("org.hibernate:hibernate-validator:4.3.0.Final") optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1") @@ -443,14 +443,14 @@ project("spring-web") { compile(project(":spring-context")) optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter compile("aopalliance:aopalliance:1.0") - optional("com.caucho:hessian:3.2.1") - optional("rome:rome:1.0") - optional("javax.el:el-api:1.0") - optional("javax.faces:jsf-api:1.2_08") + provided("javax.el:javax.el-api:2.2.4") + provided("javax.faces:jsf-api:1.2_08") provided("javax.portlet:portlet-api:2.0") provided("javax.servlet:javax.servlet-api:3.0.1") provided("javax.servlet.jsp:jsp-api:2.1") provided("javax.activation:activation:1.1") + optional("com.caucho:hessian:3.2.1") + optional("rome:rome:1.0") optional("commons-fileupload:commons-fileupload:1.2") optional("commons-io:commons-io:1.3") optional("commons-httpclient:commons-httpclient:3.1") @@ -576,7 +576,7 @@ project("spring-webmvc-tiles3") { dependencies { provided(project(":spring-context")) provided(project(":spring-web")) - provided("javax.el:el-api:1.0") + provided("javax.el:javax.el-api:2.2.4") provided("javax.servlet:jstl:1.2") provided("javax.servlet.jsp:jsp-api:2.1") optional("org.apache.tiles:tiles-request-api:1.0.1")