From 3714f0aa013cc6fdab45499fdca8179927041ca5 Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Mon, 31 Jan 2011 15:07:54 -0500
Subject: [PATCH] preparing for M2

---
 pom.xml                             | 24 +++++++++++++++++++++++-
 spring-data-commons-aspects/pom.xml |  2 +-
 spring-data-commons-core/pom.xml    |  2 +-
 spring-data-commons-parent/pom.xml  |  4 ++--
 src/main/resources/changelog.txt    | 11 +++++++++++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1798dcd7a..d83e8c189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons-dist</artifactId>
 	<name>Spring Data Commons Distribution</name>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>1.0.0.M2</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -27,6 +27,28 @@
 			</roles>
 			<timezone>-5</timezone>
 		</developer>
+		<developer>
+			<id>olivergierke</id>
+			<name>Oliver Gierke</name>
+			<email>ogierke at vmware.com</email>
+			<organization>SpringSource</organization>
+			<organizationUrl>http://www.SpringSource.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>mhunger</id>
+			<name>Michael Hunger</name>
+			<email>michael.hunger at neotechnology.com</email>
+			<organization>Neo Technology</organization>
+			<organizationUrl>http://www.neotechnology.com</organizationUrl>
+			<roles>
+				<role>Developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
 	</developers>
 
 	<licenses>
diff --git a/spring-data-commons-aspects/pom.xml b/spring-data-commons-aspects/pom.xml
index 6397e1519..71f21e5b2 100644
--- a/spring-data-commons-aspects/pom.xml
+++ b/spring-data-commons-aspects/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-commons-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M2</version>
 		<relativePath>../spring-data-commons-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-commons-aspects</artifactId>
diff --git a/spring-data-commons-core/pom.xml b/spring-data-commons-core/pom.xml
index 5e825ae0c..57db09746 100644
--- a/spring-data-commons-core/pom.xml
+++ b/spring-data-commons-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-commons-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<version>1.0.0.M2</version>
 		<relativePath>../spring-data-commons-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-commons-core</artifactId>
diff --git a/spring-data-commons-parent/pom.xml b/spring-data-commons-parent/pom.xml
index 8df5e8ec0..a5c960359 100644
--- a/spring-data-commons-parent/pom.xml
+++ b/spring-data-commons-parent/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>spring-data-commons-parent</artifactId>
 	<name>Spring Data Commons Parent</name>
 	<url>http://www.springsource.org/spring-data</url>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>1.0.0.M2</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
 		<log4j.version>1.2.15</log4j.version>
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.4.RELEASE</org.springframework.version>
+		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
 	</properties>
 	<profiles>
 		<profile>
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index 280f66203..6a982f92c 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,17 @@
 Spring Data Commons Changelog
 =============================================
 
+Changes in version 1.0.0.M2 (2011-01-31)
+----------------------------------------
+
+General
+* Indexed annotation now has an "indexName" attribute
+
+Repository
+* Improvements in the pagination support
+* Introduced Property abstraction for more sophisticated query method name parsing.
+* Made transaction support in repository factory base classes optional
+
 Changes in version 1.0.0.M1 (2010-12-23)
 ----------------------------------------