diff --git a/build.properties b/build.properties
index f7186fa3dbe..c02cd8ed995 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=3.1.1
+version=3.1.2
 
 natural.name=spring-framework
 project.name=Spring Framework
@@ -17,13 +17,13 @@ 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
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index a9c7d9f7f26..0bfe968b8d7 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index b20e5acb067..8cc325453b8 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index 55c17057c5c..f1158dbed2e 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index bc118f6be80..fc24e7a7068 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index e43bef9736f..1f9eb0d6614 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index d2aa43cc00f..5cba80439c6 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index b550abf98e6..e10898b8587 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 4d8870871eb..551182e7447 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml
index 312a1b9553b..7143a3375d9 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index 5d58d319163..e8d1a344466 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 78719d80fc7..2d1bb324b0e 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 0c6ab186456..2c8b3d0e690 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index a47b9ad9c40..e9d1757e428 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index d5f1dcfad4b..e1875b69ba3 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 8c94b0eaf30..f400ed24418 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml
index 2393472525e..327ad1fcd55 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.1.RELEASE</version>
+  <version>3.1.2.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 df17e502d61..8f073c8b95f 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.1.RELEASE</version>
+  <version>3.1.2.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 2611c273021..841cfbb3070 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 77a2d4c78f5..65ca6ec1bed 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 96306a511d1..a82422c7568 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index e315af15397..c5b814a4ea4 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml
index e81a5f4aa0b..826b41e6880 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index a70618dee31..6f417ddbee9 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.1.RELEASE</version>
+  <version>3.1.2.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.RELEASE</version>
+    <version>3.1.2.BUILD-SNAPSHOT</version>
   </parent>
   <licenses>
     <license>