From 1dfc42550fa137e336857977f204120930f12d15 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlossg@users.sourceforge.net>
Date: Sun, 25 Dec 2005 00:21:49 +0000
Subject: [PATCH] Add spring-mock to dependency management Add ldap
 dependencies Simplify spring dependencies

---
 adapters/pom.xml |  1 -
 core/pom.xml     | 35 ++++++++++++++++++++++-------------
 pom.xml          |  9 +++++++++
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/adapters/pom.xml b/adapters/pom.xml
index ec8b42f787..e2b7b7cef3 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 9a8c7cdac1..f627627c87 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -16,23 +16,11 @@
       <artifactId>spring-remoting</artifactId>
       <version>1.2.6</version>
     </dependency>
-    <!-- required due to problem in maven transitive deps -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>1.2.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>1.2.6</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
       <version>1.2.6</version>
     </dependency>
-    <!-- end required -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-support</artifactId>
@@ -42,7 +30,6 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -67,6 +54,16 @@
       <artifactId>commons-codec</artifactId>
       <version>1.3</version>
     </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
     <dependency>
       <groupId>aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
@@ -85,5 +82,17 @@
       <version>1.7.3.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>directory</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>0.9.3</version>
+      <scope>test</scope>
+    </dependency> 
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 6907e4c605..f8b5987e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,4 +249,13 @@
     </plugins>
   </reporting>
 
+  <dependencyManagement>
+    <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-mock</artifactId>
+      <version>1.2.6</version>
+    </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>
\ No newline at end of file