From 8154161ef5eb6d0b78132d11e0ed24c80edfc99d Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 18 Dec 2008 02:37:00 +0000
Subject: [PATCH] SEC-1035: Updated build to use Spring 3.0.0.M1 Release

---
 acl/pom.xml                                   |   6 +-
 cas/pom.xml                                   |   4 +-
 core/pom.xml                                  |  38 ++--
 itest/misc/pom.xml                            |   2 +-
 itest/pom.xml                                 |  56 ++---
 openid/pom.xml                                |   6 +-
 pom.xml                                       | 205 +++++++++++++-----
 portlet/pom.xml                               |   2 +-
 samples/cas/client/pom.xml                    |   8 +-
 samples/contacts/pom.xml                      |   8 +-
 .../java/sample/contact/DeleteController.java |   4 +-
 samples/dms/pom.xml                           |   6 +-
 samples/ldap/pom.xml                          |   8 +-
 samples/openid/pom.xml                        |   8 +-
 samples/portlet/pom.xml                       |  11 +-
 samples/preauth/pom.xml                       |   8 +-
 samples/tutorial/pom.xml                      |   8 +-
 sandbox/captcha/pom.xml                       |   2 +-
 sandbox/heavyduty/pom.xml                     |  12 +-
 sandbox/other/pom.xml                         |   2 +-
 sandbox/webflow/pom.xml                       |   8 +-
 taglibs/pom.xml                               |  18 +-
 .../AuthorizeTagExpressionLanguageTests.java  |  21 +-
 23 files changed, 265 insertions(+), 186 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index 19940c0e59..29178e11ad 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -35,15 +35,15 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
+            <artifactId>org.springframework.context.support</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/cas/pom.xml b/cas/pom.xml
index 963c07a494..2e58c49113 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -28,11 +28,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
+            <artifactId>org.springframework.transaction</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index f177c4218c..a07264d4dd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,43 +13,41 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>org.springframework.expression</artifactId>
-            <version>3.0.0.BUILD-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>org.springframework.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr</artifactId>
+        </dependency>
+        <dependency>
+            <!-- Used by SPEL -->
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+        </dependency>          
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>org.springframework.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+            <artifactId>org.springframework.context</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/itest/misc/pom.xml b/itest/misc/pom.xml
index 8c822d07cb..f74154d372 100644
--- a/itest/misc/pom.xml
+++ b/itest/misc/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <version>2.5.5</version>
             <scope>test</scope>
         </dependency>
diff --git a/itest/pom.xml b/itest/pom.xml
index 3fede2a411..9959259c44 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -14,11 +14,11 @@
         <!-- module>webflow</module-->
         <module>context</module>
     </modules>
-    <dependencies>     
+    <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
-            <version>2.5.5</version>
+            <version>2.5.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -29,13 +29,14 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
+            <version>2.5.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
@@ -43,37 +44,21 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
+                    <artifactId>org.springframework.core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
+                    <artifactId>org.springframework.context</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
+                    <artifactId>org.springframework.aop</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
-            </exclusions>            
-        </dependency>
-	    <dependency>
-	        <groupId>org.aspectj</groupId>
-		    <artifactId>aspectjrt</artifactId>
-		    <version>1.6.1</version>
-	    </dependency>
-	    <dependency>
-	        <groupId>org.aspectj</groupId>
-		    <artifactId>aspectjweaver</artifactId>
-		    <version>1.6.1</version>
-	    </dependency>	            
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.4.3</version>
-            <scope>runtime</scope>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.server</groupId>
@@ -85,7 +70,7 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
-            </exclusions>            
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.server</groupId>
@@ -101,13 +86,12 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.ldap</groupId>
-            <artifactId>spring-ldap</artifactId>
-            <version>1.2.1</version>
+            <artifactId>spring-ldap-core</artifactId>
             <scope>runtime</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
+                    <artifactId>org.springframework.core</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -116,9 +100,15 @@
                 <exclusion>
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
-                </exclusion>                             
-            </exclusions>            
-        </dependency>               
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.3</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
@@ -134,8 +124,6 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.13</version>
-            <scope>runtime</scope>
         </dependency>
     </dependencies>
     <build>
@@ -183,10 +171,10 @@
                         </property>
                     </systemProperties>
                 </configuration>
-            </plugin>            
+            </plugin>
         </plugins>
     </build>
     <properties>
         <jetty.version>6.1.11</jetty.version>
-    </properties>  
+    </properties>
 </project>
diff --git a/openid/pom.xml b/openid/pom.xml
index f919a720a6..10bd45ba20 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -26,17 +26,17 @@
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
+          <artifactId>org.springframework.core</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-web</artifactId>
+          <artifactId>org.springframework.web</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-test</artifactId>
+          <artifactId>org.springframework.test</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 0b8b07b615..5c78e2f085 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,9 +49,9 @@
     <ciManagement>
         <system>bamboo</system>
         <url>https://build.springframework.org/browse/SEC</url>
-    </ciManagement>    
+    </ciManagement>
 
-    <distributionManagement>    
+    <distributionManagement>
         <repository>
             <id>spring-milestone</id>
             <name>Spring Milestone Repository</name>
@@ -91,17 +91,22 @@
             <name>SpringSource Enterprise Bundle Repository - SpringSource Snapshot Releases</name>
             <url>http://repository.springsource.com/maven/bundles/snapshot</url>
         </repository>
+        <repository>
+            <id>com.springsource.repository.bundles.mileston</id>
+            <name>SpringSource Enterprise Bundle Repository - SpringSource Milestone Releases</name>
+            <url>http://repository.springsource.com/maven/bundles/milestone</url>
+        </repository>
         <repository>
             <id>spring-milestone</id>
             <name>Spring Portfolio Milestone Repository</name>
             <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
         </repository>
-		<repository>
-		    <!-- needed for jets3t-0.5.1-20080115 -->
-			<id>springExternal</id>
-			<name>Spring external dependencies</name>
-			<url>http://maven.springframework.org/external/</url>
-		</repository>        
+        <repository>
+            <!-- needed for jets3t-0.5.1-20080115 -->
+            <id>springExternal</id>
+            <name>Spring external dependencies</name>
+            <url>http://maven.springframework.org/external/</url>
+        </repository>
     </repositories>
 
     <mailingLists>
@@ -238,10 +243,10 @@
         </contributor>
         <contributor>
             <name>Ruud Senden</name>
-        </contributor>                
+        </contributor>
         <contributor>
             <name>Michael Mayr</name>
-        </contributor>        
+        </contributor>
     </contributors>
 
     <dependencies>
@@ -261,7 +266,7 @@
                 <version>1.2.2</version>
             </extension>
         </extensions>
-        <plugins>            
+        <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-help-plugin</artifactId>
@@ -307,7 +312,7 @@
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
-                </configuration>                
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -458,11 +463,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
                 <version>2.4.2</version>
-<!--                
+<!--
                 <configuration>
                     <aggregate>true</aggregate>
-                </configuration>                
--->                
+                </configuration>
+-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -472,7 +477,7 @@
                     <excludes>
                         <exclude>bigbank/**</exclude>
                     </excludes>
-                </configuration>                
+                </configuration>
             </plugin>
             <!--
                 <plugin>
@@ -492,14 +497,14 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>                    
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.4</version>
                 <configuration>
                     <aggregate>true</aggregate>
                     <header>Spring Security Framework</header>
                     <quiet>true</quiet>
-                    <excludePackageNames>sample,bigbank,zzz</excludePackageNames>                                        
+                    <excludePackageNames>sample,bigbank,zzz</excludePackageNames>
                     <links>
                         <link>
                             http://java.sun.com/j2se/1.5.0/docs/api
@@ -543,7 +548,7 @@
                       <!--<report>test-javadoc</report> -->
                     </reports>
                   </reportSet>
-                </reportSets>                
+                </reportSets>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -553,7 +558,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.0.1</version>
-<!--                
+<!--
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -565,8 +570,8 @@
                         </reports>
                     </reportSet>
                 </reportSets>
--->                
-            </plugin>           
+-->
+            </plugin>
         </plugins>
     </reporting>
 
@@ -574,84 +579,162 @@
         <dependencies>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
+                <artifactId>org.springframework.core</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-test</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-<!--            
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-remoting</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
--->            
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
+                <artifactId>org.springframework.expression</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.antlr</groupId>
+                        <artifactId>com.springsource.org.antlr</artifactId>
+                    </exclusion>
+                </exclusions>
+                <optional>true</optional>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-jdbc</artifactId>
+                <artifactId>org.springframework.test</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-tx</artifactId>
+                <artifactId>org.springframework.jdbc</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-aop</artifactId>
+                <artifactId>org.springframework.transaction</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
+                <artifactId>org.springframework.aop</artifactId>
                 <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-context-support</artifactId>
+                <artifactId>org.springframework.context</artifactId>
                 <version>${spring.version}</version>
-            </dependency>            
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.context.support</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.web</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.web.servlet</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.ldap</groupId>
                 <artifactId>spring-ldap-core</artifactId>
                 <version>1.3.0.RC1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>com.springsource.org.aspectj.runtime</artifactId>
                 <version>1.6.2.RELEASE</version>
-            </dependency>       
+            </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>com.springsource.org.aspectj.weaver</artifactId>
                 <version>1.6.2.RELEASE</version>
             </dependency>
             <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-webmvc</artifactId>
-                <version>${spring.version}</version>                
-            </dependency>            
+                <!-- Used by SPEL -->
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr</artifactId>
+                <version>3.0.1</version>
+                <optional>true</optional>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <!-- Used by SPEL -->
+                <groupId>asm</groupId>
+                <artifactId>asm-all</artifactId>
+                <version>2.2.3</version>
+                <optional>true</optional>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <scope>test</scope>
                 <optional>true</optional>
                 <version>2.1_3</version>
-            </dependency>       
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.14</version>  <!-- 1.2.15 has some JMX dependencies we don't want in its POM -->
-                <optional>true</optional>
-                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
@@ -667,6 +750,7 @@
                 <groupId>hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
                 <version>1.8.0.7</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.jmock</groupId>
@@ -702,16 +786,23 @@
                 <artifactId>standard</artifactId>
                 <version>${jstl.version}</version>
                 <scope>runtime</scope>
-            </dependency>                        
+            </dependency>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.14</version>  <!-- 1.2.15 has some JMX dependencies we don't want in its POM -->
+                <optional>true</optional>
+                <scope>runtime</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <properties>
-        <spring.version>2.5.6</spring.version>
+        <spring.version>3.0.0.M1</spring.version>
         <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>        
+        <docbook.target>${basedir}/target/site/guide</docbook.target>
     </properties>
 
 </project>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 810a83cbfd..8d587d1093 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>spring-test</artifactId>
+          <artifactId>org.springframework.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 966ed9056a..f2964ba2e0 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -22,20 +22,20 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
     
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 1d8d67dd0e..1212cf890f 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -27,22 +27,22 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/samples/contacts/src/main/java/sample/contact/DeleteController.java b/samples/contacts/src/main/java/sample/contact/DeleteController.java
index 390a7bba6b..2b3da26a90 100644
--- a/samples/contacts/src/main/java/sample/contact/DeleteController.java
+++ b/samples/contacts/src/main/java/sample/contact/DeleteController.java
@@ -19,7 +19,7 @@ import org.springframework.beans.factory.InitializingBean;
 
 import org.springframework.util.Assert;
 
-import org.springframework.web.bind.RequestUtils;
+import org.springframework.web.bind.ServletRequestUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;
 
@@ -49,7 +49,7 @@ public class DeleteController implements Controller, InitializingBean {
 
     public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
-        int id = RequestUtils.getRequiredIntParameter(request, "contactId");
+        int id = ServletRequestUtils.getRequiredIntParameter(request, "contactId");
         Contact contact = contactManager.getById(new Long(id));
         contactManager.delete(contact);
 
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index 4c5170e326..e102a53a10 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -28,12 +28,12 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 9a4627817b..61bd0491ce 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -17,21 +17,21 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index 3074d9e610..c158653fc7 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -22,22 +22,22 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
 		<dependency>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index f210a77a4c..fd7b8092aa 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -32,19 +32,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring</artifactId>
+			<artifactId>org.springframework.web.portlet</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-portlet</artifactId>
-			<version>2.0.8</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
+			<artifactId>org.springframework.test</artifactId>
 		</dependency>
 <!--	    
 		<dependency>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 043b72f1b8..27dc35099e 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -17,20 +17,20 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 5c0faaa58f..3781b7a604 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -22,20 +22,20 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/captcha/pom.xml b/sandbox/captcha/pom.xml
index cf66b36c1a..4f9fef4d51 100644
--- a/sandbox/captcha/pom.xml
+++ b/sandbox/captcha/pom.xml
@@ -22,7 +22,7 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.test</artifactId>
             <scope>test</scope>
         </dependency>        
     </dependencies>
diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml
index 6a22913d02..e8ee97da33 100755
--- a/sandbox/heavyduty/pom.xml
+++ b/sandbox/heavyduty/pom.xml
@@ -18,27 +18,27 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+            <artifactId>org.springframework.core</artifactId>
             <version>${spring.version}</version>
         </dependency>                
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>org.springframework.context</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
+            <artifactId>org.springframework.jdbc</artifactId>
             <scope>runtime</scope>
             <version>${spring.version}</version>    
         </dependency>
@@ -49,7 +49,7 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
+            <artifactId>org.springframework.aop</artifactId>
             <scope>runtime</scope>
             <version>${spring.version}</version>
         </dependency>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index 99bcdefaa9..6b073db7ad 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -19,7 +19,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <artifactId>org.springframework.test</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml
index edbcb02778..4b5707ff1a 100644
--- a/sandbox/webflow/pom.xml
+++ b/sandbox/webflow/pom.xml
@@ -35,22 +35,22 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <artifactId>org.springframework.web</artifactId>
             <version>2.5.5</version>            
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
+            <artifactId>org.springframework.core</artifactId>
             <version>2.5.5</version>            
         </dependency>                
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <artifactId>org.springframework.context</artifactId>
             <version>2.5.5</version>            
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
+            <artifactId>org.springframework.web.servlet</artifactId>
             <version>2.5.5</version>            
         </dependency>
         <dependency>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index 87c0071222..9147a0c472 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -22,14 +22,14 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-acl</artifactId>
             <version>${project.version}</version>
-        </dependency>        
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
+            <artifactId>org.springframework.web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>org.springframework.test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -42,7 +42,11 @@
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-junit4</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -55,7 +59,7 @@
                     <include>**/*</include>
                 </includes>
                 <filtering>false</filtering>
-            </resource>            
+            </resource>
         </resources>
     </build>
 </project>
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
index 424d812021..d8f32eeabc 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagExpressionLanguageTests.java
@@ -15,25 +15,26 @@
 
 package org.springframework.security.taglibs.authz;
 
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.el.ExpressionEvaluator;
+import javax.servlet.jsp.el.VariableResolver;
+import javax.servlet.jsp.tagext.Tag;
+
 import junit.framework.TestCase;
 
+import org.jmock.Mockery;
+import org.springframework.mock.web.MockPageContext;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
-
 import org.springframework.security.context.SecurityContextHolder;
-
 import org.springframework.security.providers.TestingAuthenticationToken;
 
-import org.springframework.mock.web.MockPageContext;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
-
 
 /**
  * Test case to implement commons-el expression language expansion.
  */
 public class AuthorizeTagExpressionLanguageTests extends TestCase {
+    Mockery jmock = new Mockery();
     //~ Instance fields ================================================================================================
 
     private final AuthorizeTag authorizeTag = new AuthorizeTag();
@@ -43,7 +44,11 @@ public class AuthorizeTagExpressionLanguageTests extends TestCase {
     //~ Methods ========================================================================================================
 
     protected void setUp() throws Exception {
-        pageContext = new MockPageContext();
+        pageContext = new MockPageContext() {
+            public VariableResolver getVariableResolver() {
+                return null;
+            }
+        };
         authorizeTag.setPageContext(pageContext);
 
         currentUser = new TestingAuthenticationToken("abc", "123",