diff --git a/build.properties b/build.properties
index 4f3d372542..f7186fa3db 100644
--- a/build.properties
+++ b/build.properties
@@ -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 97d553602d..a9c7d9f7f2 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 24fee0721b..b20e5acb06 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index 74646897c1..55c17057c5 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index d058436cda..bc118f6be8 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 60db41abf7..e43bef9736 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 4853e18988..d2aa43cc00 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index a7c4471bde..b550abf98e 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index be54d4c6ac..4d8870871e 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml
index b51a73fc7f..312a1b9553 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index 53dffc8408..5d58d31916 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 71847ef90d..78719d80fc 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 4853aa826a..0c6ab18645 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 986f8b2068..a47b9ad9c4 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 3f0e0c7225..d5f1dcfad4 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index eb76992b08..8c94b0eaf3 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml
index c768410efe..2393472525 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</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 1f25cc2443..df17e502d6 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</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 0b83020954..2611c27302 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index fbce590147..77a2d4c78f 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index cb2f097a28..96306a511d 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 04a529f531..e315af1539 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml
index 9102b3f0e2..e81a5f4aa0 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index b18374cdd3..a70618dee3 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.BUILD-SNAPSHOT</version>
+  <version>3.1.1.RELEASE</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.1.BUILD-SNAPSHOT</version>
+    <version>3.1.1.RELEASE</version>
   </parent>
   <licenses>
     <license>