From b7bc9dbea4f35673a5459134231aeccfb18b4ebd Mon Sep 17 00:00:00 2001
From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Sat, 2 Sep 2006 15:03:31 +0000
Subject: [PATCH] better definition of spring dependencies removing unwanted
 dependencies for certain products (xml-apis, xmlParserAPIs).

---
 pom.xml         | 32 +++++++++++++++++++++++++++-----
 support/pom.xml |  6 +++---
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5caa533..0dba6ad0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,12 @@
       <artifactId>jmock-cglib</artifactId>
       <version>1.1.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>cglib</groupId>
+          <artifactId>cglib-full</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -79,14 +85,14 @@
         <version>1.7.0</version>
       </dependency>
       <dependency>
-        <groupId>springframework</groupId>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>1.2.6</version>
+        <version>1.2.8</version>
       </dependency>
       <dependency>
-        <groupId>springframework</groupId>
-        <artifactId>spring-hibernate</artifactId>
-        <version>1.2.6</version>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-orm</artifactId>
+        <version>1.2.8</version>
       </dependency>
       <!-- should be possible to remove the dependence on log4j -->
       <dependency>
@@ -98,6 +104,12 @@
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
         <version>1.6</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>ehcache</groupId>
@@ -123,6 +135,16 @@
         <groupId>jaxen</groupId>
         <artifactId>jaxen</artifactId>
         <version>1.1-beta-9</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xom</groupId>
+            <artifactId>xom</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
     </dependencies>
diff --git a/support/pom.xml b/support/pom.xml
index 909ee00b..4030050d 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -24,12 +24,12 @@
       <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
-      <groupId>springframework</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-hibernate</artifactId>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
     </dependency>
     <!-- should be possible to remove the dependence on log4j -->
     <dependency>
-- 
2.31.1