From fc9a1f0242ebb9d34893aef134a8b0c21d8b699f Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 27 Dec 2008 00:02:15 +0000
Subject: [PATCH] Remove parent from itest module - force explicit Spring 2.5
 dependency

---
 itest/context/pom.xml |  1 +
 itest/pom.xml         | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index 6185a25f62..0fdb30c22e 100644
--- a/itest/context/pom.xml
+++ b/itest/context/pom.xml
@@ -21,6 +21,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/itest/pom.xml b/itest/pom.xml
index 9959259c44..15526299d2 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -1,10 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
-    </parent>
+    <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-itest</artifactId>
     <name>Spring Security - Integration Tests</name>
     <packaging>pom</packaging>
@@ -87,11 +83,12 @@
         <dependency>
             <groupId>org.springframework.ldap</groupId>
             <artifactId>spring-ldap-core</artifactId>
+            <version>1.3.0.RC1</version>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>org.springframework.core</artifactId>
+                    <artifactId>spring-core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -124,6 +121,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
         </dependency>
     </dependencies>
     <build>