From d986585be8c0b02f64a8952c8d6811bd704330d0 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 13 Aug 2012 13:54:59 +0200 Subject: [PATCH] Make spring-orm dependency on spring-web optional Historically spring-orm has had an optional dependency on spring-web, primarily in support of OpenSessionInView functionality. This optional dependency was inadvertently made required when porting the build to Gradle. This commit simply reintroduces the optional setting. Issue: SPR-9632 --- build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3d6d2f6993..01189f071e 100644 --- a/build.gradle +++ b/build.gradle @@ -434,15 +434,16 @@ project('spring-orm') { testCompile "commons-dbcp:commons-dbcp:1.2.2" testCompile "org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1" testCompile "org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1" - compile(project(":spring-web")) { - exclude group: 'javax.persistence', module: 'persistence-api' - } compile project(":spring-core") compile project(":spring-beans") compile(project(":spring-aop"), optional) compile(project(":spring-context"), optional) compile project(":spring-tx") compile project(":spring-jdbc") + compile(project(":spring-web")) { dep -> + optional dep + exclude group: 'javax.persistence', module: 'persistence-api' + } } }