From 76ce826345c3605cee27e957f5d346140411af85 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlossg@users.sourceforge.net>
Date: Wed, 3 May 2006 17:38:19 +0000
Subject: [PATCH] Remove spring transitive deps, add log4j

---
 core/pom.xml | 37 +++++++------------------------------
 pom.xml      | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 4eaf9eed3e..5c0074326a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -54,6 +54,11 @@
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
     </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -117,37 +122,9 @@
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
-
-    <!-- to be removed when spring has poms -->
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-dao</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-aop</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.0-m2</version>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
     </dependency>
 
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 431fb38819..c5978c1b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,11 +253,18 @@
 
   <dependencyManagement>
     <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <version>2.0-m2</version>
-    </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-mock</artifactId>
+        <version>2.0-m2</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.9</version>
+        <optional>true</optional>
+        <scope>runtime</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>