diff --git a/mvn-build/core/pom.xml b/mvn-build/core/pom.xml
index a53ea26e..5919b2ef 100644
--- a/mvn-build/core/pom.xml
+++ b/mvn-build/core/pom.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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.ldap</groupId>
 	<artifactId>spring-ldap</artifactId>
@@ -68,13 +71,6 @@
 			<groupId>com.sun</groupId>
 			<artifactId>ldapbp</artifactId>
 			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../lib/ldapbp.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>org.acegisecurity</groupId>
-			<artifactId>acegi-security</artifactId>
-			<version>1.0.3</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Spring Dependencies -->
@@ -94,12 +90,6 @@
 			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-dao</artifactId>
-			<version>${spring.version}</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
diff --git a/mvn-build/pom.xml b/mvn-build/pom.xml
index 43307945..66046260 100644
--- a/mvn-build/pom.xml
+++ b/mvn-build/pom.xml
@@ -22,92 +22,92 @@
 	<properties>
 		<docbook.source>${basedir}/src/docbkx</docbook.source>
 		<docbook.target>${basedir}/target/site/guide</docbook.target>
-		<spring.version>2.0.8</spring.version>
+		<spring.version>2.5.4</spring.version>
 	</properties>
-
-	<!--
-	<profiles>
-		<profile>
-		</profile>
-	</profiles>
-	-->
-
-	<build>
-		<plugins>
-           <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.4.2</version>
-                <configuration>
-                    <forkMode>once</forkMode>
-                </configuration>
-            </plugin>
 
-           <plugin>
-                <groupId>com.agilejava.docbkx</groupId>
-                <artifactId>docbkx-maven-plugin</artifactId>
-                <version>2.0.7</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-html</goal>
-                            <goal>generate-pdf</goal>
-                        </goals>
-                        <phase>pre-site</phase>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.docbook</groupId>
-                        <artifactId>docbook-xml</artifactId>
-                        <version>4.4</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <includes>index.xml</includes>
-                    <chunkedOutput>true</chunkedOutput>
-                    <xincludeSupported>true</xincludeSupported>
-                    <htmlStylesheet>css/html.css</htmlStylesheet>
-                    <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
-                    <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-                    <entities>
-                        <entity>
-                            <name>version</name>
-                            <value>${pom.version}</value>
-                        </entity>
-                    </entities>
-                    <postProcess>
-                        <copy todir="target/site/reference">
-                            <fileset dir="target/docbkx">
-                                <include name="**/*.html" />
-                                <include name="**/*.pdf" />
-                            </fileset>
-                        </copy>
-                        <copy todir="target/site/reference/html/images">
-                            <fileset dir="src/docbkx/images">
-                                <include name="**/*.css" />
-                                <include name="**/*.png" />
-                                <include name="**/*.gif" />
-                                <include name="**/*.jpg" />
-                            </fileset>
-                        </copy>
-                    </postProcess>
-                </configuration>
-            </plugin>
-	</plugins>
-	</build>
-	<reporting>
-		<plugins>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-javadoc-plugin</artifactId>
-                                <version>2.4</version>
-                                <configuration>
-                                        <aggregate>true</aggregate>
-                                        <header>Spring LDAP Integration</header>
-                                        <link>
-                                                http://java.sun.com/j2se/1.5.0/docs/api
+<build>
+	<plugins>
+		<plugin>
+			<artifactId>maven-eclipse-plugin</artifactId>
+			<configuration>
+				<downloadSources>true</downloadSources>
+			</configuration>
+		</plugin>
+
+   <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.4.2</version>
+	<configuration>
+	    <forkMode>once</forkMode>
+	</configuration>
+    </plugin>
+
+   <plugin>
+	<groupId>com.agilejava.docbkx</groupId>
+	<artifactId>docbkx-maven-plugin</artifactId>
+	<version>2.0.7</version>
+	<executions>
+	    <execution>
+		<goals>
+		    <goal>generate-html</goal>
+		    <goal>generate-pdf</goal>
+		</goals>
+		<phase>pre-site</phase>
+	    </execution>
+	</executions>
+	<dependencies>
+	    <dependency>
+		<groupId>org.docbook</groupId>
+		<artifactId>docbook-xml</artifactId>
+		<version>4.4</version>
+		<scope>runtime</scope>
+	    </dependency>
+	</dependencies>
+	<configuration>
+	    <includes>index.xml</includes>
+	    <chunkedOutput>true</chunkedOutput>
+	    <xincludeSupported>true</xincludeSupported>
+	    <htmlStylesheet>css/html.css</htmlStylesheet>
+	    <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+	    <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+	    <entities>
+		<entity>
+		    <name>version</name>
+		    <value>${pom.version}</value>
+		</entity>
+	    </entities>
+	    <postProcess>
+		<copy todir="target/site/reference">
+		    <fileset dir="target/docbkx">
+			<include name="**/*.html" />
+			<include name="**/*.pdf" />
+		    </fileset>
+		</copy>
+		<copy todir="target/site/reference/html/images">
+		    <fileset dir="src/docbkx/images">
+			<include name="**/*.css" />
+			<include name="**/*.png" />
+			<include name="**/*.gif" />
+			<include name="**/*.jpg" />
+		    </fileset>
+		</copy>
+	    </postProcess>
+	</configuration>
+    </plugin>
+</plugins>
+</build>
+<reporting>
+	<plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-javadoc-plugin</artifactId>
+			<version>2.4</version>
+			<configuration>
+				<aggregate>true</aggregate>
+				<header>Spring LDAP Integration</header>
+				<link>
+					http://java.sun.com/j2se/1.5.0/docs/api
                                         </link>
                                         <link>
                                                 http://static.springframework.org/spring/docs/2.5.x/api/
diff --git a/mvn-build/test-support/pom.xml b/mvn-build/test-support/pom.xml
index fff5fdde..15386390 100644
--- a/mvn-build/test-support/pom.xml
+++ b/mvn-build/test-support/pom.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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.ldap</groupId>
@@ -71,7 +74,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
diff --git a/mvn-build/tiger/pom.xml b/mvn-build/tiger/pom.xml
index cdb8c8dd..f85131fe 100644
--- a/mvn-build/tiger/pom.xml
+++ b/mvn-build/tiger/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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.ldap</groupId>
 	<artifactId>spring-ldap-tiger</artifactId>
@@ -32,11 +34,11 @@
 			<artifactId>spring-ldap</artifactId>
 			<version>1.2.2-SNAPSHOT</version>
 		</dependency>
-                <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <version>3.8.2</version>
-                        <scope>test</scope>
-                </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>