diff --git a/acl/pom.xml b/acl/pom.xml
index 3676b0f030..2530aa066f 100644
--- a/acl/pom.xml
+++ b/acl/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>spring-security-parent</artifactId>
         <groupId>org.springframework.security</groupId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-acl</artifactId>
     <name>Spring Security - ACL module</name>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -51,29 +51,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    
-    <properties>
-        <spring.osgi.export>
-            org.springframework.security.*;version=${pom.version.osgi}
-        </spring.osgi.export>
-            
-        <spring.osgi.import>
-            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
-            org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
-            org.springframework.context.*;version="${spring.version.osgi}",
-            org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.transaction.support.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            javax.sql.*
-        </spring.osgi.import>
-
-        <spring.osgi.private.pkg>
-            !org.springframework.security.*
-        </spring.osgi.private.pkg>
-
-        <spring.osgi.symbolic.name>org.springframework.security.acls</spring.osgi.symbolic.name>        
-    </properties>    
-    
+<!--
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>       
+-->
 </project>
\ No newline at end of file
diff --git a/adapters/catalina/pom.xml b/adapters/catalina/pom.xml
index e6fce377a4..7e7c000c91 100644
--- a/adapters/catalina/pom.xml
+++ b/adapters/catalina/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-catalina</artifactId>
   <name>Spring Security - Catalina adapter</name>
diff --git a/adapters/jboss/pom.xml b/adapters/jboss/pom.xml
index 36f1f91c11..7ac1de4e70 100644
--- a/adapters/jboss/pom.xml
+++ b/adapters/jboss/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-jboss</artifactId>
   <name>Spring Security - JBoss adapter</name>
diff --git a/adapters/jetty/pom.xml b/adapters/jetty/pom.xml
index 2e01223b0c..54abbbccfe 100644
--- a/adapters/jetty/pom.xml
+++ b/adapters/jetty/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-jetty</artifactId>
   <name>Spring Security - Jetty adapter</name>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index a07d5c1127..45a5ccc97b 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-parent</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-adapters</artifactId>
   <name>Spring Security - Adapters</name>
diff --git a/adapters/resin/pom.xml b/adapters/resin/pom.xml
index 027411ffb9..c87cb5f956 100644
--- a/adapters/resin/pom.xml
+++ b/adapters/resin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-adapters</artifactId>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
   </parent>
   <artifactId>spring-security-resin</artifactId>
   <name>Spring Security - Resin adapter</name>
diff --git a/cas/pom.xml b/cas/pom.xml
index 0fb5942202..a00e076579 100644
--- a/cas/pom.xml
+++ b/cas/pom.xml
@@ -3,11 +3,11 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-cas-client</artifactId>
     <name>Spring Security - CAS support</name>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -47,28 +47,12 @@
         </dependency>
     </dependencies>
     
-    <properties>
-      	<spring.osgi.export>
-      	    org.springframework.security.*;version=${pom.version.osgi}
-      	</spring.osgi.export>
-            
-    	<spring.osgi.import>
-    	    org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
-            org.springframework.beans.*;version="${spring.version.osgi}",
-            org.springframework.context.*;version="${spring.version.osgi}",
-            org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
-            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            org.jasig.cas.client.*;version="[3.1.3, 4.0.0)"
-    	</spring.osgi.import>
-
-    	<spring.osgi.private.pkg>
-    	    !org.springframework.security.*
-    	</spring.osgi.private.pkg>
-
-    	<spring.osgi.symbolic.name>org.springframework.security.cas</spring.osgi.symbolic.name>        
-    </properties>    
-    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 4d5eedd5fb..022e59148a 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -3,9 +3,9 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
-    <packaging>bundle</packaging>    
+    <packaging>jar</packaging>    
     <artifactId>spring-security-core-tiger</artifactId>
     <name>Spring Security - Java 5 (Tiger)</name>
 
@@ -59,39 +59,10 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>            
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <configuration>
-                    <targetJdk>1.5</targetJdk>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <properties>
-      	<spring.osgi.export>
-      	    org.springframework.security.*;version=${pom.version}
-      	</spring.osgi.export>
-            
-    	<spring.osgi.import>
-    	    javax.annotation.*;version="[1.0.0, 2.0.0)",
-    	    org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
-    	    org.springframework.core.*;version="${spring.version.osgi}"
-    	</spring.osgi.import>
-
-    	<spring.osgi.private.pkg>
-    	    !org.springframework.security.*
-    	</spring.osgi.private.pkg>
-    	
-    	<spring.osgi.include.res>
-    	    src/main/resources
-    	</spring.osgi.include.res>
-
-    	<spring.osgi.symbolic.name>org.springframework.security.annotation</spring.osgi.symbolic.name>        
-    </properties>    
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index 60faa540ec..5199930131 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,9 +3,9 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <artifactId>spring-security-core</artifactId>
     <name>Spring Security - Core</name>
 
@@ -142,57 +142,12 @@
         </dependency>
     </dependencies>
     
-    <properties>
-      	<spring.osgi.export>
-      	    org.springframework.security.*;version=${pom.version}
-      	</spring.osgi.export>
-
-    	<spring.osgi.import>
-    	    !com.ibm.websphere.security,
-            javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
-            net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional,
-            org.aopalliance.*;version="[1.0.0, 2.0.0)",
-            org.apache.commons.codec.*;version="[1.3.0, 2.0.0)",
-            org.apache.commons.collections.*;version="[3.2.0, 4.0.0)",
-            org.apache.commons.lang.*;version="[2.1.0, 3.0.0)",
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            org.apache.directory.server.configuration.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.apache.directory.server.core.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.apache.directory.server.protocol.*;version="[1.0.2, 2.0.0)";resolution:=optional,
-            org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional,
-            org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
-            org.springframework.aop.*;version="${spring.version.osgi}",
-            org.springframework.beans.*;version="${spring.version.osgi}",
-            org.springframework.context.*;version="${spring.version.osgi}",
-            org.springframework.core.*;version="${spring.version.osgi}",
-            org.springframework.dao.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.jdbc.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.ldap.*;version="[1.2.1.A, 2.0.0)";resolution:=optional,
-            org.springframework.metadata.*;version="${spring.version.osgi}",
-            org.springframework.mock.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.remoting.*;version="${spring.version.osgi}";resolution:=optional,
-            org.springframework.util.*;version="${spring.version.osgi}",
-            org.springframework.web.*;version="${spring.version.osgi}";resolution:=optional,
-            javax.crypto.*,
-            javax.naming.*,
-            javax.rmi.*,
-            javax.security.*,
-            javax.sql.*,
-            javax.xml.parsers.*,
-            org.w3c.dom.*,
-            org.xml.sax.*,            
-        	*;resolution:=optional    	    
-    	</spring.osgi.import>
-
-    	<spring.osgi.private.pkg>
-    	    !org.springframework.security.*
-    	</spring.osgi.private.pkg>
-<!--    	
-    	<spring.osgi.include.res>
-    	    src/main/resources
-    	</spring.osgi.include.res>
--->
-    	<spring.osgi.symbolic.name>org.springframework.security.core</spring.osgi.symbolic.name>        
-    </properties>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/ntlm/pom.xml b/ntlm/pom.xml
index 5b5ae079c5..045c7a681c 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
     <packaging>jar</packaging>
     <artifactId>spring-security-ntlm</artifactId>
diff --git a/openid/pom.xml b/openid/pom.xml
index deb773cb63..f5773c4b24 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-parent</artifactId>
-        <version>2.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
     <artifactId>spring-security-openid</artifactId>
     <name>Spring Security - OpenID support</name>
     <description>Spring Security - Support for OpenID</description>
-    <version>2.0.5-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <version>2.0.5.CI-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -45,26 +45,14 @@
             <version>0.9.3</version>
         </dependency>
     </dependencies>
-
-    <properties>
-        <spring.osgi.export>
-            org.springframework.security.*;version=${pom.version.osgi}
-        </spring.osgi.export>
-
-        <spring.osgi.import>
-            javax.servlet.*;version="[2.4.0, 3.0.0)",
-            org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
-            org.openid4java.*;version="[0.9.3, 1.0.0)",
-            org.springframework.security.*;version="[${pom.version.osgi},${pom.version.osgi}]",
-            org.springframework.beans.*;version="${spring.version.osgi}",
-            org.springframework.util.*;version="${spring.version.osgi}"
-        </spring.osgi.import>
-
-        <spring.osgi.private.pkg>
-            !org.springframework.security.*
-        </spring.osgi.private.pkg>
-
-        <spring.osgi.symbolic.name>org.springframework.security.openid</spring.osgi.symbolic.name>
-    </properties>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>
+    </build>    
 
 </project>
diff --git a/pom.xml b/pom.xml
index 9b6f162914..59d8c80182 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.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
     <name>Spring Security</name>
     <packaging>pom</packaging>
 
@@ -38,9 +38,9 @@
 
     <!-- Note when doing releases: tagBase is set in release plugin configuration below -->
     <scm>
-        <connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</connection>
-        <developerConnection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/trunk</developerConnection>
-        <url>http://acegisecurity.svn.sourceforge.net/viewcvs.cgi/acegisecurity/spring-security/trunk/</url>
+        <connection>scm:svn:https://src.springframework.org/svn/spring-security/branches/2.0.x-branch/</connection>
+        <developerConnection>scm:svn:https://src.springframework.org/svn/spring-security/branches/2.0.x-branch/</developerConnection>
+        <url>https://src.springframework.org/svn/spring-security/branches/2.0.x-branch/</url>
     </scm>
 
     <issueManagement>
@@ -64,16 +64,6 @@
             <name>Spring Snapshot Repository</name>
             <url>s3://maven.springframework.org/snapshot</url>
         </snapshotRepository>
-
-        <site>
-            <id>local</id>
-            <name>Local Site Directory</name>
-            <!--
-            This variable is set by the build release script. You can also set it on the command line if
-            you are running maven directly. e.g. mvn site -DsiteDirectory=file:///home/joe/mysite
-            -->
-            <url>${siteDirectory}</url>
-        </site>
     </distributionManagement>
 
     <repositories>
@@ -84,6 +74,19 @@
 		</repository>
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>com.springsource.repository.maven.milestone</id>
+            <name>SpringSource Enterprise Bundle Repository - SpringSource Milestone Releases</name>
+            <url>http://repository.springsource.com/maven/bundles/milestone</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>com.springsource.repository.bundles.snapshot</id>
+            <name>SpringSource Enterprise Bundle Repository - Snapshots</name>
+            <url>http://repository.springsource.com/maven/bundles/snapshot</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <mailingLists>
         <mailingList>
             <name>Acegi Developer List</name>
@@ -236,11 +239,29 @@
     <build>
         <extensions>
             <extension>
-                <groupId>org.springframework.aws</groupId>
-                <artifactId>spring-aws-maven</artifactId>
-                <version>1.2.2</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.BUILD-20090617.134232-66</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>
@@ -364,7 +385,7 @@
                 <version>2.0-beta-7</version>
                 <configuration>
                     <tagBase>
-                        https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/spring-security/tags
+                        https://src.springframework.org/svn/spring-security/tags
                     </tagBase>
                 </configuration>
             </plugin>
@@ -449,35 +470,6 @@
                     </postProcess>
                 </configuration>
             </plugin>
-             <!-- OSGi Felix bundle plugin -->
-             <plugin>
-                 <groupId>org.apache.felix</groupId>
-                 <artifactId>maven-bundle-plugin</artifactId>
-                 <version>1.4.0</version>
-                 <extensions>true</extensions>
-
-                 <configuration>
-                     <obrRepository>NONE</obrRepository>        
-                     <instructions>
-                         <!-- bundle specific conf -->      
-                         <Bundle-Name>${artifactId}</Bundle-Name>
-                         <Bundle-SymbolicName>${spring.osgi.symbolic.name}</Bundle-SymbolicName>
-                         <Bundle-Vendor>SpringSource</Bundle-Vendor>
-                         <Export-Package>${spring.osgi.export}</Export-Package>
-                         <Import-Package>${spring.osgi.import}</Import-Package>
-                         <Private-Package>${spring.osgi.private.pkg}</Private-Package>
-                         <!--Include-Resource>${spring.osgi.include.res}</Include-Resource-->
-                         <!-- jar entries -->
-                         <Implementation-Title>Spring Security</Implementation-Title>
-                         <Implementation-Version>${pom.version}</Implementation-Version>
-                         <Implementation-Vendor>SpringSource</Implementation-Vendor>
-                         <Implementation-Vendor-Id>org.springframework.security</Implementation-Vendor-Id>
-                         <!-- Spring specific entries -->                         
-                         <!--Spring-Version>${spring.maven.artifact.version}</Spring-Version-->
-                     </instructions>
-                     <excludeDependencies>true</excludeDependencies> 
-                 </configuration>
-             </plugin>             
         </plugins>
     </build>
 
@@ -723,13 +715,11 @@
                 <artifactId>standard</artifactId>
                 <version>${jstl.version}</version>
                 <scope>runtime</scope>
-            </dependency>                        
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <properties>
-        <pom.version.osgi>2.0.3.RELEASE</pom.version.osgi>
         <spring.version>2.0.8</spring.version>
-        <spring.version.osgi>[2.0.8, 3.0.0)</spring.version.osgi>
         <jstl.version>1.1.2</jstl.version>
 
         <docbook.source>${basedir}/src/docbkx</docbook.source>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 44e4bb81ee..b135fbee75 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 2d7382fce0..1d5e8a1380 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 58d92a2e6b..f59172a2ea 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 ee77b758c3..652db5b32c 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 c5b582ba8e..276b61f651 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 ad207b2557..79595c2c9e 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 4248c651ee..8e384adb21 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 a845bf6d69..6db2312f39 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 18abb13201..d87e1beabf 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 9f134d2d80..61b29c2d98 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 4e4a18e35f..8f6f83f211 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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 8e770d3649..52cd9fc961 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.CI-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-tutorial</artifactId>
diff --git a/sandbox/webflow/pom.xml b/sandbox/webflow/pom.xml
index ea62ecd8fb..926e4709db 100644
--- a/sandbox/webflow/pom.xml
+++ b/sandbox/webflow/pom.xml
@@ -10,23 +10,23 @@
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-webflow</artifactId>
     <name>Spring Security - Webflow sample</name>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
     <packaging>war</packaging>
     <dependencies>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5.CI-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core-tiger</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5.CI-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5.CI-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.webflow</groupId>
diff --git a/taglibs/pom.xml b/taglibs/pom.xml
index ca015050a8..ed9cc11b05 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.0.5-SNAPSHOT</version>
+        <version>2.0.5.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.0.5-SNAPSHOT</version>
+    <version>2.0.5.CI-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -64,5 +64,11 @@
                 <filtering>false</filtering>
             </resource>            
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>com.springsource.bundlor</groupId>
+                <artifactId>com.springsource.bundlor.maven</artifactId>
+            </plugin>
+        </plugins>        
     </build>
 </project>