diff --git a/build.properties b/build.properties
index a60c29a93a5..e920fe80bed 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=3.1.4
+version=3.1.5
 
 natural.name=spring-framework
 project.name=Spring Framework
@@ -17,16 +17,16 @@ spring.osgi.range="${spring.osgi.range.nq}"
 aj.osgi.range="[1.6.8, 2.0.0)"
 
 ## For GA releases
-release.type=release
-build.stamp=RELEASE
+#release.type=release
+#build.stamp=RELEASE
 
 ## For milestone releases
 #release.type=milestone
 #build.stamp=M1
 
 ## For trunk development / ci builds
-#release.type=integration
-#build.stamp=BUILD-SNAPSHOT
+release.type=integration
+build.stamp=BUILD-SNAPSHOT
 
 #bundlor
 fail.on.warnings=false
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index eee2d6fe06c..1dc92a9235f 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aop</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 6251a558242..dbe820b49e7 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-asm</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index d054eacf919..3a59d68aed4 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aspects</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index b78e0834753..08cdfaf1071 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-beans</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 07a82a53ca0..5290b8cdc06 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context-support</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 2bd5f347517..98547103401 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index b7065644849..3f69e5af5fa 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-core</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 2016dd98d86..6814c936fd0 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-expression</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml
index 6b8ba459371..b9cabcc404c 100644
--- a/org.springframework.instrument.tomcat/pom.xml
+++ b/org.springframework.instrument.tomcat/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument-tomcat</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index eaa38791a5d..c4d38c9bd94 100644
--- a/org.springframework.instrument/pom.xml
+++ b/org.springframework.instrument/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index b138a4dfc88..1ce25476818 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-integration-tests</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index e7a391fe8fc..2edfe49391a 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 1171baecf94..057955ce13e 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 5cdd260af1f..656a09b96d5 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-orm</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 54fa6c05642..a5c58106652 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-oxm</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml
index 66d3815aab4..12f3b72bdd5 100644
--- a/org.springframework.spring-library/pom.xml
+++ b/org.springframework.spring-library/pom.xml
@@ -6,7 +6,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-library</artifactId>
   <packaging>libd</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <name>Spring Framework</name>
   <description>Spring is a layered Java/J2EE application platform, based on code published in Expert
   One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index 2b37dcfb40b..06256063dfd 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -6,7 +6,7 @@
   <artifactId>spring-parent</artifactId>
   <packaging>pom</packaging>
   <name>Spring Framework - Parent</name>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <description>Spring Framework Parent</description>
   <scm>
     <url>https://fisheye.springframework.org/browse/spring-framework</url>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index ac6ff32b39d..29b177fabc6 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-test</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 56ef4702c5a..d3904e309ff 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-tx</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index b27bcccd9bf..348b2ba88e8 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc-portlet</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 29cd91eccda..0fdc41c8a7f 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml
index a61bcacec43..4be5365e805 100644
--- a/org.springframework.web.struts/pom.xml
+++ b/org.springframework.web.struts/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-struts</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index 7c21585961f..eadb1bc2b38 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -6,12 +6,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-web</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.4.RELEASE</version>
+  <version>3.1.5.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.4.RELEASE</version>
+    <version>3.1.5.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>