diff --git a/acl/pom.xml b/acl/pom.xml
index 017cad20f1..f0ce51a238 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -31,13 +31,17 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/cas/pom.xml b/cas/pom.xml
index 30303bd6e1..dc01a6030c 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -22,17 +22,17 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>    
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index ae9e7198c1..76d3d255d0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,21 +22,11 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-remoting</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-support</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
@@ -44,7 +34,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/itest/pom.xml b/itest/pom.xml
index 2ed45273f7..3fede2a411 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>
+    <modelVersion>4.0.0</modelVersion>
+    <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>
@@ -25,7 +29,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>2.5.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -50,10 +53,6 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-aop</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-support</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index 671436cd98..118ac7e07a 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-mock</artifactId>
+          <artifactId>spring-test</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index ad5101e3bc..6caa3fda3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <module>cas</module>
         <module>acl</module>
         <module>taglibs</module>
+        <module>itest</module>
   </modules>
 
     <description>Spring Security</description>
@@ -608,12 +609,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-dao</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-support</artifactId>
+                <artifactId>spring-tx</artifactId>
                 <version>${spring.version}</version>
             </dependency>
             <dependency>
@@ -626,6 +622,11 @@
                 <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context-support</artifactId>
+                <version>${spring.version}</version>
+            </dependency>            
             <dependency>
                 <groupId>org.springframework.ldap</groupId>
                 <artifactId>spring-ldap</artifactId>
@@ -711,6 +712,7 @@
         <spring.version>2.5.5</spring.version>
         <spring.version.osgi>[2.5.5, 3.1.0)</spring.version.osgi>
         <jstl.version>1.1.2</jstl.version>
+        <jetty.version>6.1.11</jetty.version>
 
         <docbook.source>${basedir}/src/docbkx</docbook.source>
         <docbook.target>${basedir}/target/site/guide</docbook.target>        
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 1cce6d6b05..518f85412a 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -32,18 +32,14 @@
           <version>1.0</version>
           <scope>provided</scope>
         </dependency>
-        <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-dao</artifactId>
-        </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-portlet</artifactId>
-          <version>${spring.version}</version>
+          <version>2.0.8</version>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-mock</artifactId>
+          <artifactId>spring-test</artifactId>
           <version>${spring.version}</version>
           <scope>test</scope>
         </dependency>
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index f691b797ee..966ed9056a 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/cas-sample</contextPath>
                     <connectors>
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index e03f00cb11..3aaca4cb34 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -14,7 +14,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/cas</contextPath>
                     <webApp>${basedir}/cas-server-webapp-3.2.1.war</webApp>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index c257930de3..1d8d67dd0e 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -42,12 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-remoting</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -92,7 +87,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/contacts</contextPath>
                     <!--jettyConfig>${basedir}/src/test/resources/jetty.xml</jettyConfig-->
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index 11ce2c5e80..4c5170e326 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 6a391773ea..c48442dc6d 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -72,7 +72,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/ldap</contextPath>
                 </configuration>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index 1d539e0b38..3074d9e610 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -52,18 +52,10 @@
 
     <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.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/openid</contextPath>
                 </configuration>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index 7961b18be4..f210a77a4c 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
+			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 91c1be8a20..043b72f1b8 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -42,18 +42,10 @@
 
     <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.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/preauth</contextPath>
                     <userRealms>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index f74ee57e65..5c0faaa58f 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -62,18 +62,10 @@
 
     <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.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <contextPath>/tutorial</contextPath>
                     <connectors>
diff --git a/sandbox/captcha/pom.xml b/sandbox/captcha/pom.xml
index 6cfa57fce6..a1b2622bfd 100644
--- a/sandbox/captcha/pom.xml
+++ b/sandbox/captcha/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0.4-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
@@ -29,7 +29,7 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml
index 7e30b559b5..ab18fb3697 100755
--- a/sandbox/heavyduty/pom.xml
+++ b/sandbox/heavyduty/pom.xml
@@ -159,7 +159,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.7</version>
+                <version>6.1.11</version>
                 <configuration>
                     <contextPath>/heavyduty</contextPath>
                     <!--jettyConfig>jetty-jmx.xml</jettyConfig-->
@@ -185,7 +185,7 @@
     </build>
     <properties>        
         <spring.version>2.5.5</spring.version>
-        <spring.security.version>2.0.4-SNAPSHOT</spring.security.version>
+        <spring.security.version>2.5.0-SNAPSHOT</spring.security.version>
     </properties>
 
 </project>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index ac44fb0bbf..f5b9077b2f 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-sandbox</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-sandbox-other</artifactId>
   <name>Spring Security - Other Sandbox Code</name>
@@ -25,18 +25,17 @@
     </dependency>    
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-mock</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.ldap</groupId>
-      <artifactId>spring-ldap</artifactId>
-      <version>1.2.1</version>
+      <artifactId>spring-test</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-dao</artifactId>
+      <artifactId>spring-tx</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap</artifactId>
+      <version>1.2.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index aaa940bd38..0617e947de 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-sandbox</artifactId>
   <name>Spring Security - Sandbox</name>
@@ -23,17 +23,5 @@
       <version>${pom.version}</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>
-      </plugins>
-  </build>
+
 </project>
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index afe31af149..347fb7fec5 100644
--- a/sandbox/webwork/pom.xml
+++ b/sandbox/webwork/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-sandbox</artifactId>
-    <version>2.0.4-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-webwork</artifactId>
   <name>Spring Security - Webwork support</name>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index c791ff32ab..ca6f6efce2 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>