From d60108eaf640a9eed183c7c32e7fd1391505e594 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Sun, 25 Aug 2013 19:47:57 -0500
Subject: [PATCH] SEC-2229: Add optional dependencies to spring-security-config

spring-tx and spring-jdbc aren't pulled in transitively from
spring-security-web now, so we must include them as optional dependencies.
---
 config/config.gradle |  4 +++-
 config/pom.xml       | 26 ++++++++++++++------------
 web/pom.xml          |  6 ++++++
 web/web.gradle       |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/config/config.gradle b/config/config.gradle
index 57fe44bb78..ada3e7effb 100644
--- a/config/config.gradle
+++ b/config/config.gradle
@@ -20,7 +20,9 @@ dependencies {
              project(':spring-security-openid'),
              "org.springframework:spring-web:$springVersion",
              "org.springframework:spring-webmvc:$springVersion",
-             "org.aspectj:aspectjweaver:$aspectjVersion"
+             "org.aspectj:aspectjweaver:$aspectjVersion",
+             "org.springframework:spring-jdbc:$springVersion",
+             "org.springframework:spring-tx:$springVersion"
 
     provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion"
 
diff --git a/config/pom.xml b/config/pom.xml
index fb9a5c4570..83c04e8610 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -126,6 +126,20 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>3.2.3.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>3.2.3.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
@@ -326,12 +340,6 @@
       <version>3.2.3.RELEASE</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>3.2.3.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
@@ -344,11 +352,5 @@
       <version>3.2.3.RELEASE</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-tx</artifactId>
-      <version>3.2.3.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/web/pom.xml b/web/pom.xml
index 5556d2ddfe..721f7fe1fb 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -91,6 +91,12 @@
       <version>3.2.3.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>3.2.3.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
diff --git a/web/web.gradle b/web/web.gradle
index 046872b8ab..cc43b0cdcf 100644
--- a/web/web.gradle
+++ b/web/web.gradle
@@ -5,7 +5,7 @@ dependencies {
             'aopalliance:aopalliance:1.0',
             "org.springframework:spring-beans:$springVersion",
             "org.springframework:spring-context:$springVersion",
-            "org.springframework:spring-expression:$springVersion"
+            "org.springframework:spring-expression:$springVersion",
             "org.springframework:spring-web:$springVersion"
 
     optional "org.springframework:spring-webmvc:$springVersion",