From 12d8e14a6138ddeae487e3a494d93ac1ed509f63 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 3 Jan 2009 05:45:08 +0000
Subject: [PATCH] Reinstated parent for itest module, to prevent problems
 during mvn:deploy on build server

---
 itest/pom.xml | 73 ++++-----------------------------------------------
 pom.xml       | 10 ++++++-
 2 files changed, 14 insertions(+), 69 deletions(-)

diff --git a/itest/pom.xml b/itest/pom.xml
index 15526299d2..7fd38a6f4f 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -1,6 +1,10 @@
 <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>
-    <groupId>org.springframework.security</groupId>
+    <parent>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-parent</artifactId>
+        <version>2.5.0-SNAPSHOT</version>
+    </parent>
     <artifactId>spring-security-itest</artifactId>
     <name>Spring Security - Integration Tests</name>
     <packaging>pom</packaging>
@@ -83,22 +87,7 @@
         <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>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -121,58 +110,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <includes>
-                        <include>**/*Tests.class</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/Abstract*</exclude>
-                    </excludes>
-                    <forkMode>once</forkMode>
-                    <systemProperties>
-                        <!-- The working directory for the embedded apache Ldap test server -->
-                        <property>
-                            <name>apacheDSWorkDir</name>
-                            <value>
-                                ${basedir}/target/apacheds-work
-                            </value>
-                        </property>
-                    </systemProperties>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-        <jetty.version>6.1.11</jetty.version>
-    </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 5c78e2f085..973b79ad35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -697,6 +697,14 @@
                 <artifactId>spring-ldap-core</artifactId>
                 <version>1.3.0.RC1</version>
                 <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-beans</artifactId>
+                    </exclusion>
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
@@ -799,7 +807,7 @@
     <properties>
         <spring.version>3.0.0.M1</spring.version>
         <jstl.version>1.1.2</jstl.version>
-        <jetty.version>6.1.11</jetty.version>
+        <jetty.version>6.1.14</jetty.version>
 
         <docbook.source>${basedir}/src/docbkx</docbook.source>
         <docbook.target>${basedir}/target/site/guide</docbook.target>