From 0288204432192979f906e5ec7642c3e3b7ea4223 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 19 Sep 2007 00:23:33 +0000
Subject: [PATCH] SEC-369: Made spring-jdbc and spring-remoting optional
 dependencies in core. Removed explicit commons-lang dependency and updated
 commons logging to 1.1.

---
 adapters/cas/pom.xml      |  5 +++++
 adapters/catalina/pom.xml |  5 +++++
 adapters/jboss/pom.xml    |  5 +++++
 adapters/jetty/pom.xml    |  5 +++++
 adapters/resin/pom.xml    |  5 +++++
 core/pom.xml              | 21 +++++++++++----------
 pom.xml                   | 12 +++++++++++-
 samples/contacts/pom.xml  | 21 +++++++++++++++------
 samples/tutorial/pom.xml  |  5 +++++
 9 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/adapters/cas/pom.xml b/adapters/cas/pom.xml
index 0a8e0c5853..6aed474f0d 100644
--- a/adapters/cas/pom.xml
+++ b/adapters/cas/pom.xml
@@ -22,5 +22,10 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml
index 5c7d347a2c..900b38aff2 100644
--- a/adapters/catalina/pom.xml
+++ b/adapters/catalina/pom.xml
@@ -13,5 +13,10 @@
       <artifactId>catalina</artifactId>
       <version>4.1.9</version>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml
index dadc713836..4263a8d261 100644
--- a/adapters/jboss/pom.xml
+++ b/adapters/jboss/pom.xml
@@ -19,5 +19,10 @@
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>test</scope>
+    </dependency>      
   </dependencies>
 </project>
diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml
index 0538959e7c..b9d776158e 100644
--- a/adapters/jetty/pom.xml
+++ b/adapters/jetty/pom.xml
@@ -13,5 +13,10 @@
       <artifactId>org.mortbay.jetty</artifactId>
       <version>4.2.22</version>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>test</scope>
+    </dependency>      
   </dependencies>
 </project>
diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml
index 7e70d15cd0..01be0336d0 100644
--- a/adapters/resin/pom.xml
+++ b/adapters/resin/pom.xml
@@ -19,5 +19,10 @@
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>test</scope>
+    </dependency>      
   </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index a97b0a4ba5..9ecd4ef0bf 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,15 +20,21 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
         <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-remoting</artifactId>
-		</dependency>
+            <optional>true</optional>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-support</artifactId>
 			<scope>runtime</scope>
@@ -61,15 +67,10 @@
 			<version>2.0.11</version>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.1</version>
-		</dependency>
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.0.4</version>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
@@ -138,7 +139,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.12</version>
         </dependency>
 	</dependencies>
 
diff --git a/pom.xml b/pom.xml
index d785ece8f9..7bb54ab484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
         <module>adapters</module>
 		<module>portlet</module>
         <module>samples</module>
-        <module>ntlm</module>        
+        <module>ntlm</module>
     </modules>
 
 	<description>Acegi Security System for Spring</description>
@@ -560,6 +560,16 @@
 				<version>${spring.version}</version>
 			</dependency>
 			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-aop</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
+            <dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
+            <dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
 				<version>1.2.9</version>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 790b1c8dd1..58bae326fb 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -24,6 +24,21 @@
         <version>${spring.version}</version>
         <scope>compile</scope>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-jdbc</artifactId>
+        <scope>compile</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-aop</artifactId>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-remoting</artifactId>
+        <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -60,12 +75,6 @@
       <version>1.0.6</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-ldap</artifactId>
-      <version>1.1.2</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index b1cdb04c00..c0778a63ad 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -20,6 +20,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>