From 45c54c558c5860a027cab2d2e5cb3119c532569a Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 13 May 2009 06:16:05 +0000
Subject: [PATCH] Updated build to use maven.springframework.org deps

---
 acl/pom.xml                                   |   6 +-
 cas/pom.xml                                   |   4 +-
 config/pom.xml                                |   6 +-
 core/pom.xml                                  |  23 ++--
 .../security/MockJoinPoint.java               |   4 +
 itest/misc/pom.xml                            |   2 +-
 itest/pom.xml                                 |   2 +-
 openid/pom.xml                                |   6 +-
 pom.xml                                       | 118 ++++++++----------
 portlet/pom.xml                               |   4 +-
 samples/cas/client/pom.xml                    |   8 +-
 samples/contacts/pom.xml                      |  10 +-
 samples/dms/pom.xml                           |   6 +-
 samples/ldap/pom.xml                          |   6 +-
 samples/openid/pom.xml                        |   8 +-
 samples/portlet/pom.xml                       |   4 +-
 samples/preauth/pom.xml                       |   2 +-
 samples/tutorial/pom.xml                      |   8 +-
 sandbox/heavyduty/pom.xml                     |  12 +-
 sandbox/other/pom.xml                         |   8 +-
 sandbox/webflow/pom.xml                       |  12 +-
 taglibs/pom.xml                               |   4 +-
 web/pom.xml                                   |   6 +-
 23 files changed, 128 insertions(+), 141 deletions(-)

diff --git a/acl/pom.xml b/acl/pom.xml
index d27e35e1ab..ddd39c4334 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -26,15 +26,15 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context.support</artifactId>
+            <artifactId>spring-context-support</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/cas/pom.xml b/cas/pom.xml
index ca812b08df..48de2a4b40 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -33,11 +33,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.transaction</artifactId>
+            <artifactId>spring-tx</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 6f34aac0f4..c8346e4520 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -52,12 +52,12 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -98,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index eb3eecf903..57d236b9f9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,51 +12,52 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.expression</artifactId>
+            <artifactId>spring-expression</artifactId>
         </dependency>
-            <!-- Used by SPEL -->
+            <!-- Used by SPEL 
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
         </dependency>
+-->        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.core</artifactId>
+            <artifactId>spring-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context</artifactId>
+            <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.transaction</artifactId>
+            <artifactId>spring-tx</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
-            <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+            <artifactId>aspectjrt</artifactId>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
-            <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+            <artifactId>aspectjweaver</artifactId>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
diff --git a/core/src/test/java/org/springframework/security/MockJoinPoint.java b/core/src/test/java/org/springframework/security/MockJoinPoint.java
index 158643addd..041175cd7e 100644
--- a/core/src/test/java/org/springframework/security/MockJoinPoint.java
+++ b/core/src/test/java/org/springframework/security/MockJoinPoint.java
@@ -161,5 +161,9 @@ public class MockJoinPoint implements JoinPoint {
         public String toShortString() {
             throw new UnsupportedOperationException("mock not implemented");
         }
+
+        public int getId() {
+            throw new UnsupportedOperationException("mock not implemented");
+        }
     }
 }
diff --git a/itest/misc/pom.xml b/itest/misc/pom.xml
index 566adb07d7..e07b6d6a4d 100644
--- a/itest/misc/pom.xml
+++ b/itest/misc/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <version>2.5.5</version>
             <scope>test</scope>
         </dependency>
diff --git a/itest/pom.xml b/itest/pom.xml
index 34dc1ae730..fc1ad5ccce 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
diff --git a/openid/pom.xml b/openid/pom.xml
index 8a03268b6e..5a1ed9394f 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -26,17 +26,17 @@
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>org.springframework.core</artifactId>
+          <artifactId>spring-core</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>org.springframework.web</artifactId>
+          <artifactId>spring-web</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>org.springframework.test</artifactId>
+          <artifactId>spring-test</artifactId>
           <optional>true</optional>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index d59163992b..6689d019d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
     </distributionManagement>
 
     <repositories>
+<!-- 
         <repository>
             <releases>
               <enabled>true</enabled>
@@ -85,18 +86,7 @@
             <id>com.springsource.repository.bundles.release</id>
             <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
             <url>http://repository.springsource.com/maven/bundles/release</url>
-        </repository>
-        <repository>
-            <releases>
-              <enabled>true</enabled>
-            </releases>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>            
-            <id>com.springsource.repository.bundles.external</id>
-            <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
-        </repository>
+        </repository>       
         <repository>
             <releases>
               <enabled>false</enabled>
@@ -108,6 +98,7 @@
             <name>SpringSource Enterprise Bundle Repository - SpringSource Snapshot Releases</name>
             <url>http://repository.springsource.com/maven/bundles/snapshot</url>
         </repository>
+-->        
         <repository>
             <releases>
               <enabled>true</enabled>
@@ -115,23 +106,10 @@
             <snapshots>
               <enabled>false</enabled>
             </snapshots>            
-            <id>com.springsource.repository.bundles.milestone</id>
-            <name>SpringSource Enterprise Bundle Repository - SpringSource Milestone Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/milestone</url>
-        </repository>
-<!--        
-        <repository>
-            <releases>
-              <enabled>true</enabled>
-            </releases>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>            
-            <id>spring-milestone</id>
-            <name>Spring Portfolio Milestone Repository</name>
-            <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
-        </repository>
--->        
+            <id>Spring Framework Maven Milestone Releases</id>
+            <name>Spring Framework Maven Milestone Releases (Maven Central Format)</name>
+            <url>http://maven.springframework.org/milestone</url>
+        </repository>      
     </repositories>
 
     <pluginRepositories>
@@ -607,23 +585,23 @@
         <dependencies>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.core</artifactId>
+                <artifactId>spring-core</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.expression</artifactId>
+                <artifactId>spring-expression</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
 <!--
                     <exclusion>
@@ -636,89 +614,94 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.test</artifactId>
+                <artifactId>spring-test</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.jdbc</artifactId>
+                <artifactId>spring-jdbc</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.transaction</artifactId>
+                <artifactId>spring-tx</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.aop</artifactId>
+                <artifactId>spring-aop</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.context</artifactId>
+                <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.context.support</artifactId>
+                <artifactId>spring-context-support</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <!-- M3 Pom contains an invalid quartz dep -->
+                        <groupId>quartz</groupId>
+                        <artifactId>quartz</artifactId>
+                    </exclusion>                    
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.web</artifactId>
+                <artifactId>spring-web</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>org.springframework.web.servlet</artifactId>
+                <artifactId>spring-webmvc</artifactId>
                 <version>${spring.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -747,33 +730,32 @@
             </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
-                <artifactId>com.springsource.org.aspectj.runtime</artifactId>
-                <version>1.6.2.RELEASE</version>
+                <artifactId>aspectjrt</artifactId>
+                <version>1.6.4</version>
             </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
-                <artifactId>com.springsource.org.aspectj.weaver</artifactId>
-                <version>1.6.2.RELEASE</version>
+                <artifactId>aspectjweaver</artifactId>
+                <version>1.6.4</version>
             </dependency>
-            
-<!-- Used by SPEL     
-            <dependency>
 
+<!-- Used by SPEL
+            <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr</artifactId>
                 <version>3.0.1</version>
                 <optional>true</optional>
                 <scope>runtime</scope>
             </dependency>
--->              
+
             <dependency>
-                <!-- Required 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>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 529fa9922d..c2d0a109a4 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -27,12 +27,12 @@
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>org.springframework.web.portlet</artifactId>
+          <artifactId>spring-webmvc-portlet</artifactId>
           <version>${spring.version}</version>
         </dependency>
         <dependency>
           <groupId>org.springframework</groupId>
-          <artifactId>org.springframework.test</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 caca8c0c1b..4e8f65065c 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -27,20 +27,20 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 098b3277a6..d77e570ca5 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -32,22 +32,22 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <scope>compile</scope>
-        </dependency>
+        </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index c2526ad084..582e577a36 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -20,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -28,12 +28,12 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 7f0918d4f4..206a2bb4a1 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -27,16 +27,16 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index bde3001c8b..0add842659 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -22,22 +22,22 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
 		<dependency>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index 7a96f4e1b4..5783026cff 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -32,12 +32,12 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.portlet</artifactId>
+            <artifactId>spring-webmvc-portlet</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
         </dependency>
 <!--
         <dependency>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 38c7840f10..9e275b3edc 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 7c660e37f5..8f47bc1c0c 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -27,20 +27,20 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml
index a882b5e4f5..6513727e14 100755
--- a/sandbox/heavyduty/pom.xml
+++ b/sandbox/heavyduty/pom.xml
@@ -24,23 +24,23 @@
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <scope>runtime</scope>
             <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.orm</artifactId>
+            <artifactId>spring-orm</artifactId>
             <version>${spring.version}</version>
         </dependency>
 <!--
@@ -51,13 +51,13 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context</artifactId>
+            <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.aop</artifactId>
+            <artifactId>spring-aop</artifactId>
             <scope>runtime</scope>
             <version>${spring.version}</version>
         </dependency>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index b5de2da77b..209abab62f 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -31,12 +31,12 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.test</artifactId>
+      <artifactId>spring-test</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.jdbc</artifactId>
+        <artifactId>spring-jdbc</artifactId>
         <optional>true</optional>
     </dependency>
     <dependency>
@@ -57,11 +57,11 @@
     </dependency>
     <dependency>
         <groupId>org.aspectj</groupId>
-        <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+        <artifactId>aspectjrt</artifactId>
     </dependency>
     <dependency>
         <groupId>org.aspectj</groupId>
-        <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+        <artifactId>aspectjweaver</artifactId>
     </dependency>
     <dependency>
       <groupId>ldapsdk</groupId>
diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml
index ff6aa2214c..791d30a4da 100644
--- a/sandbox/webflow/pom.xml
+++ b/sandbox/webflow/pom.xml
@@ -24,8 +24,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework.webflow</groupId>
-            <artifactId>org.springframework.webflow</artifactId>
+            <groupId>spring-webflow</groupId>
+            <artifactId>spring-webflow</artifactId>
             <version>2.0.3.RELEASE</version>
         </dependency>
         <dependency>
@@ -35,22 +35,22 @@
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <version>2.5.5</version>            
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.core</artifactId>
+            <artifactId>spring-core</artifactId>
             <version>2.5.5</version>            
         </dependency>                
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context</artifactId>
+            <artifactId>spring-context</artifactId>
             <version>2.5.5</version>            
         </dependency>        
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web.servlet</artifactId>
+            <artifactId>spring-webmvc</artifactId>
             <version>2.5.5</version>            
         </dependency>
         <dependency>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index 2f0f556ce8..90cb6793fb 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -25,11 +25,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/web/pom.xml b/web/pom.xml
index 48ca1f6835..768a4bba43 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -17,17 +17,17 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.web</artifactId>
+            <artifactId>spring-web</artifactId>
             <!-- optional>true</optional -->
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.jdbc</artifactId>
+            <artifactId>spring-jdbc</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.test</artifactId>
+            <artifactId>spring-test</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>