diff --git a/acl/pom.xml b/acl/pom.xml
index 5439f9d656..29178e11ad 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
diff --git a/cas/pom.xml b/cas/pom.xml
index 97a26b6e66..2d6ef0dc3b 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
diff --git a/core/pom.xml b/core/pom.xml
index 894540359d..a07264d4dd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-core</artifactId>
diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index 632dea3e9c..f4415c3ef4 100644
--- a/itest/context/pom.xml
+++ b/itest/context/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-itest</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest-context</artifactId>
     <name>Spring Security - Miscellaneous Application Context Integration Tests</name>
diff --git a/itest/misc/pom.xml b/itest/misc/pom.xml
index 90a616a57c..f74154d372 100644
--- a/itest/misc/pom.xml
+++ b/itest/misc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-itest</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest-misc</artifactId>
     <name>Spring Security - Miscellaneous Integration Tests</name>
diff --git a/itest/pom.xml b/itest/pom.xml
index 44c7033386..7fd38a6f4f 100644
--- a/itest/pom.xml
+++ b/itest/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest</artifactId>
     <name>Spring Security - Integration Tests</name>
     <packaging>pom</packaging>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <modules>
         <module>web</module>
         <!-- module>webflow</module-->
diff --git a/itest/web/pom.xml b/itest/web/pom.xml
index baee2e95c4..5653486c5f 100644
--- a/itest/web/pom.xml
+++ b/itest/web/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-itest</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest-web</artifactId>
     <name>Spring Security - Web Integration Tests</name>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index 96b9d022d7..720054b196 100755
--- a/ntlm/pom.xml
+++ b/ntlm/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ntlm</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index 6f5ba30ef9..10bd45ba20 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -3,12 +3,12 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-openid</artifactId>
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index fdb1339d16..e1c6d3d64e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
@@ -37,9 +37,9 @@
 
     <!-- Note when doing releases: tagBase is set in release plugin configuration below -->
     <scm>
-        <connection>scm:svn:https://src.springframework.org/svn/spring-security/tags/2.5.0.M1</connection>
-        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-security/tags/2.5.0.M1</developerConnection>
-        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/tags/2.5.0.M1</url>
+        <connection>scm:svn:https://src.springframework.org/svn/spring-security/trunk</connection>
+        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-security/trunk</developerConnection>
+        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk</url>
     </scm>
 
     <issueManagement>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 730f66185c..8d587d1093 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-portlet</artifactId>
     <name>Spring Security - Portlet support</name>
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index caa0fc2764..f2964ba2e0 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples-cas</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-client</artifactId>
diff --git a/samples/cas/pom.xml b/samples/cas/pom.xml
index d8471e725e..35c78d2425 100644
--- a/samples/cas/pom.xml
+++ b/samples/cas/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas</artifactId>
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index 7b97bcbd6b..6e7642a932 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples-cas</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-server</artifactId>
diff --git a/samples/contacts/pom.xml b/samples/contacts/pom.xml
index 5a89fbcb65..1212cf890f 100644
--- a/samples/contacts/pom.xml
+++ b/samples/contacts/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-samples-contacts</artifactId>
     <name>Spring Security - Contacts sample</name>
diff --git a/samples/dms/pom.xml b/samples/dms/pom.xml
index 6199f506ec..e102a53a10 100644
--- a/samples/dms/pom.xml
+++ b/samples/dms/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-samples-dms</artifactId>
     <name>Spring Security - DMS sample</name>
diff --git a/samples/ldap/pom.xml b/samples/ldap/pom.xml
index 11f2d39af4..61bd0491ce 100644
--- a/samples/ldap/pom.xml
+++ b/samples/ldap/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-ldap</artifactId>
diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index 0f19a344b0..c158653fc7 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-openid</artifactId>
diff --git a/samples/pom.xml b/samples/pom.xml
index a03f3aaa21..66aafd7952 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples</artifactId>
diff --git a/samples/portlet/pom.xml b/samples/portlet/pom.xml
index 091144b827..fd7b8092aa 100644
--- a/samples/portlet/pom.xml
+++ b/samples/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-portlet</artifactId>
diff --git a/samples/preauth/pom.xml b/samples/preauth/pom.xml
index 6a4321d7fa..27dc35099e 100644
--- a/samples/preauth/pom.xml
+++ b/samples/preauth/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-preauth</artifactId>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index ede8036337..3781b7a604 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-samples</artifactId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-tutorial</artifactId>
diff --git a/sandbox/captcha/pom.xml b/sandbox/captcha/pom.xml
index 69630930c5..60daca12c0 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.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
diff --git a/sandbox/heavyduty/pom.xml b/sandbox/heavyduty/pom.xml
index 5de8062f2a..e8ee97da33 100755
--- a/sandbox/heavyduty/pom.xml
+++ b/sandbox/heavyduty/pom.xml
@@ -4,7 +4,7 @@
     <artifactId>spring-security-heavyduty</artifactId>
     <name>Spring Security - Heavy Duty Sample</name>
     <packaging>war</packaging>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -185,7 +185,7 @@
     </build>
     <properties>        
         <spring.version>2.5.6</spring.version>
-        <spring.security.version>2.5.0.M1</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 436a764114..a9d4771c5b 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.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-sandbox-other</artifactId>
   <name>Spring Security - Other Sandbox Code</name>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index db90fe46ab..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.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-sandbox</artifactId>
   <name>Spring Security - Sandbox</name>
diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml
index 5bfa41840a..4b5707ff1a 100644
--- a/sandbox/webflow/pom.xml
+++ b/sandbox/webflow/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-webflow</artifactId>
     <name>Spring Security - Webflow sample</name>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <dependencies>
         <dependency>
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index d6af785f11..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.5.0.M1</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 4bcd4c9326..9147a0c472 100644
--- a/taglibs/pom.xml
+++ b/taglibs/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.5.0.M1</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-taglibs</artifactId>
     <name>Spring Security - JSP taglibs</name>
-    <version>2.5.0.M1</version>
+    <version>2.5.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>