From 0e5614289064a47a99758a95c8d9baa464ed9b56 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 8 Jun 2011 13:45:45 +0000
Subject: [PATCH] Release Spring Framework 3.1.0.M2

---
 build-spring-framework/publish-documentation.xml | 10 ++++++----
 build.properties                                 |  6 +++---
 org.springframework.aop/pom.xml                  |  4 ++--
 org.springframework.asm/pom.xml                  |  4 ++--
 org.springframework.aspects/pom.xml              |  4 ++--
 org.springframework.beans/pom.xml                |  4 ++--
 org.springframework.context.support/pom.xml      |  4 ++--
 org.springframework.context/pom.xml              |  4 ++--
 org.springframework.core/pom.xml                 |  4 ++--
 org.springframework.expression/pom.xml           |  4 ++--
 org.springframework.instrument.tomcat/pom.xml    |  4 ++--
 org.springframework.instrument/pom.xml           |  4 ++--
 org.springframework.integration-tests/pom.xml    |  4 ++--
 org.springframework.jdbc/pom.xml                 |  4 ++--
 org.springframework.jms/pom.xml                  |  4 ++--
 org.springframework.orm/pom.xml                  |  4 ++--
 org.springframework.oxm/pom.xml                  |  4 ++--
 org.springframework.spring-library/pom.xml       |  2 +-
 org.springframework.spring-parent/pom.xml        |  2 +-
 org.springframework.test/pom.xml                 |  4 ++--
 org.springframework.transaction/pom.xml          |  4 ++--
 org.springframework.web.portlet/pom.xml          |  4 ++--
 org.springframework.web.servlet/pom.xml          |  4 ++--
 org.springframework.web.struts/pom.xml           |  4 ++--
 org.springframework.web/pom.xml                  |  4 ++--
 25 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/build-spring-framework/publish-documentation.xml b/build-spring-framework/publish-documentation.xml
index cacbd3694a3..14bdce84288 100644
--- a/build-spring-framework/publish-documentation.xml
+++ b/build-spring-framework/publish-documentation.xml
@@ -3,10 +3,12 @@
 
 <!-- Main targets -->
 	<target name="publish-documentation" depends="publish-documentation.init">
-		<sshexec host="spring02.managed.contegix.com" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -rf /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
 				command="mkdir /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
 
-		<scp remoteToDir="${username}@spring02.managed.contegix.com:/opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"
+		<scp remoteToDir="${username}@static.springframework.org:/opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"
 				keyfile="${key.file}" passphrase="${passphrase}" sftp="true" verbose="true">
 			<fileset dir="${package.output.dir}">
 				<include name="changelog.txt" />
@@ -16,8 +18,8 @@
 			<fileset dir="${package.docs.dir}" />
 		</scp>
 
-		<sshexec host="spring02.managed.contegix.com" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
-				command="rm /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.0.x ; ln -s /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version} /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.0.x"/>
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -f /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x ; ln -s /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version} /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x"/>
 	</target>
 
 <!-- Other targets -->
diff --git a/build.properties b/build.properties
index 5f5f4b6ebf2..13c82f2de14 100644
--- a/build.properties
+++ b/build.properties
@@ -5,7 +5,7 @@ spring.osgi.range="${spring.osgi.range.nq}"
 aj.osgi.range="[1.5.4, 2.0.0)"
 
 #
-release.type=integration
+#release.type=integration
 natural.name=spring-framework
 project.name=Spring Framework
 project.key=SPR
@@ -22,8 +22,8 @@ compiler.args=-enableJavadoc -warn:none
 #build.stamp=RELEASE
 
 # For when releasing milestones
-#release.type=milestone
-#build.stamp=M1
+release.type=milestone
+build.stamp=M2
 
 # For development in trunk
 #release.type=integration
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 98c0cf409d4..ee55f384bf6 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aop</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 5b66af1639b..e2cf635f495 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-asm</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
 
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index d5fa43e4e9c..2650415a375 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aspects</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 67ae140c827..abc2ad644ae 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-beans</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index 9a4eb62d39d..2bbf98a58ec 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context-support</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
 
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 84d7720bf29..a5d308a750c 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 
 	<dependencies>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 4d5e6b2dbda..1367e31a52c 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 
 	<dependencies>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 1ac99341d02..87d4a200c32 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-expression</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml
index bf94631dfbc..ada458d3337 100644
--- a/org.springframework.instrument.tomcat/pom.xml
+++ b/org.springframework.instrument.tomcat/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument-tomcat</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index c7b4d47fe8c..8481829a557 100644
--- a/org.springframework.instrument/pom.xml
+++ b/org.springframework.instrument/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
 </project>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 48316c16b67..dd56028b045 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-integration-tests</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
   <dependencies>
     <dependency>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index d27a822aa82..a20259ecdb1 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 7bbc1d7bca2..b55064b2db4 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 542321ea173..b3cde2c1348 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 701b405249b..40037b3a079 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 
 	<dependencies>
diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml
index 37e9857c3fa..f97de5d83be 100644
--- a/org.springframework.spring-library/pom.xml
+++ b/org.springframework.spring-library/pom.xml
@@ -14,7 +14,7 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-library</artifactId>
   <packaging>libd</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</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 a285c198a74..521433099ea 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -14,7 +14,7 @@
   <artifactId>spring-parent</artifactId>
   <packaging>pom</packaging>
   <name>Spring Framework - Parent</name>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</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 79787997adf..68b8c894d22 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-test</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 9fed17f6faa..51a59ca8ceb 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-tx</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index ac6678b3f4f..f6de5e128e1 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc-portlet</artifactId>
   <packaging>jar</packaging>
-  <version>3.1.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 44a99a6f8af..c164fa98cdd 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 
 	<profiles>
diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml
index a82f148510e..139dd24e5fb 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.0.BUILD-SNAPSHOT</version>
+  <version>3.1.0.M2</version>
   <parent>
     <groupId>org.springframework</groupId>
     <artifactId>spring-parent</artifactId>
     <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.1.0.BUILD-SNAPSHOT</version>
+    <version>3.1.0.M2</version>
   </parent>
   <dependencies>
     <dependency>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index 09f4489bc2b..1bbf893b3a8 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.0.BUILD-SNAPSHOT</version>
+	<version>3.1.0.M2</version>
 	<parent>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-parent</artifactId>
 		<relativePath>../org.springframework.spring-parent</relativePath>
-		<version>3.1.0.BUILD-SNAPSHOT</version>
+		<version>3.1.0.M2</version>
 	</parent>
 
 	<dependencies>