diff --git a/acl/pom.xml b/acl/pom.xml
index 44b8f4dc6d..11939939d9 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
diff --git a/cas/pom.xml b/cas/pom.xml
index 9bb0539313..2e47ad2e38 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
diff --git a/config/pom.xml b/config/pom.xml
index 295c83f114..98c711304e 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-config</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index cafd8ce910..ad73756f33 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-core</artifactId>
diff --git a/itest/context/pom.xml b/itest/context/pom.xml
index c1dbf3c3c6..35f73c463e 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 f74154d372..566adb07d7 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 5844218635..34dc1ae730 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest</artifactId>
     <name>Spring Security - Integration Tests</name>
     <packaging>pom</packaging>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0.CI-SNAPSHOT</version>
     <modules>
         <module>web</module>
         <!-- module>webflow</module-->
diff --git a/itest/web/pom.xml b/itest/web/pom.xml
index c7b9c54a15..57165655c1 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-itest-web</artifactId>
     <name>Spring Security - Web Integration Tests</name>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 2a579f8584..735fc37cda 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ldap</artifactId>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index ef6093bfd4..5043b786e5 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-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ntlm</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index 0b1400a16d..09a4b65fbd 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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-SNAPSHOT</version>
+    <version>3.0.0.CI-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 15c1f16441..14e0a46867 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-SNAPSHOT</version>
+    <version>3.0.0.CI-SNAPSHOT</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
@@ -134,6 +134,14 @@
 -->        
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <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>
+        </pluginRepository>
+    </pluginRepositories>
+
     <mailingLists>
         <mailingList>
             <name>Acegi Developer List</name>
@@ -298,26 +306,34 @@
     <build>
         <extensions>
             <extension>
-              <groupId>org.springframework.build.aws</groupId>
-              <artifactId>org.springframework.build.aws.maven</artifactId>
-              <version>2.0.0.RELEASE</version>
+                <groupId>org.springframework.build.aws</groupId>
+                <artifactId>org.springframework.build.aws.maven</artifactId>
+                <version>2.0.0.RELEASE</version>
             </extension>            
         </extensions>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.springsource.bundlor</groupId>
+                    <artifactId>com.springsource.bundlor.maven</artifactId>
+                    <version>1.0.0.M2</version>
+                    <executions>
+                        <execution>
+                            <id>bundlor</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>transform</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-help-plugin</artifactId>
-                <version>2.0.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.2</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -364,6 +380,7 @@
                     </execution>
                 </executions>
             </plugin>
+<!--            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -379,6 +396,7 @@
                     </execution>
                 </executions>
             </plugin>
+-->            
             <!-- Other -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index c0f0802bbd..529fa9922d 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 4fc8d79c2e..caca8c0c1b 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 35c78d2425..95a488433e 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 ecab07cfb6..d59ebd422e 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 8e18e18a54..4f6a108d18 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 e102a53a10..c2526ad084 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 ec719eee1e..7f0918d4f4 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 c158653fc7..bde3001c8b 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 66aafd7952..e16d5efcce 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 2cd96a1666..7a96f4e1b4 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 7ca4a5ee1a..38c7840f10 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 55bb4ccb52..7c660e37f5 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 60daca12c0..15ebc9593c 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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 e8ee97da33..8a42fa6283 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-SNAPSHOT</version>
+    <version>3.0.0.CI-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-SNAPSHOT</spring.security.version>
+        <spring.security.version>3.0.0.CI-SNAPSHOT</spring.security.version>
     </properties>
 
 </project>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index ae56af2ed2..b5de2da77b 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-SNAPSHOT</version>
+    <version>3.0.0.CI-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 0617e947de..4da093c7fb 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-SNAPSHOT</version>
+    <version>3.0.0.CI-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 4b5707ff1a..ff6aa2214c 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-SNAPSHOT</version>
+    <version>3.0.0.CI-SNAPSHOT</version>
     <packaging>war</packaging>
     <dependencies>
         <dependency>
diff --git a/sandbox/webwork/pom.xml b/sandbox/webwork/pom.xml
index 347fb7fec5..8b2bfe299a 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-SNAPSHOT</version>
+    <version>3.0.0.CI-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 62a5f3cc65..5dbd53824f 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-SNAPSHOT</version>
+        <version>3.0.0.CI-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-SNAPSHOT</version>
+    <version>3.0.0.CI-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/web/pom.xml b/web/pom.xml
index 0858e457ee..bea350e9b8 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
+        <version>3.0.0.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-web</artifactId>