From 08864ba5b5d25fe8fa5715cf73a449ad66eebced Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Mon, 31 Mar 2014 17:17:51 +0200
Subject: [PATCH] DATAREST-257 - Prepare 2.1 M1.

---
 pom.xml                          | 16 ++++++------
 src/main/resources/changelog.txt | 43 ++++++++++++++++++++++++++++++++
 src/main/resources/notice.txt    |  2 +-
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 76bde355f..65cef9c5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.4.0.BUILD-SNAPSHOT</version>
+		<version>1.4.0.M1</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
@@ -27,11 +27,11 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-rest</dist.id>
 
-		<springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
-		<springdata.jpa>1.6.0.BUILD-SNAPSHOT</springdata.jpa>
-		<springdata.mongodb>1.5.0.BUILD-SNAPSHOT</springdata.mongodb>
-		<springdata.neo4j>3.1.0.BUILD-SNAPSHOT</springdata.neo4j>
-		<springdata.gemfire>1.4.0.BUILD-SNAPSHOT</springdata.gemfire>
+		<springdata.commons>1.8.0.M1</springdata.commons>
+		<springdata.jpa>1.6.0.M1</springdata.jpa>
+		<springdata.mongodb>1.5.0.M1</springdata.mongodb>
+		<springdata.neo4j>3.1.0.M1</springdata.neo4j>
+		<springdata.gemfire>1.4.0.M1</springdata.gemfire>
 
 		<hibernate.version>4.2.0.Final</hibernate.version>
 
@@ -150,8 +150,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>http://repo.spring.io/libs-snapshot</url>
+			<id>spring-libs-milestone</id>
+			<url>http://repo.spring.io/libs-milestone</url>
 		</repository>
 	</repositories>
 	
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index b51742afe..9ae04126a 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,49 @@
 Spring Data REST Changelog
 ==========================
 
+Changes in version 2.1.0.M1 (2014-03-31)
+----------------------------------------
+** Bug
+    * [DATAREST-150] - PUT vs PATCH with JPA
+    * [DATAREST-247] - NPE when calling count Queries in SD MongoDB Repositories
+    * [DATAREST-253] - AssociationOmittingSerializerModifier suffers from potential NullPointerException
+    * [DATAREST-254] - org.springframework.data.rest.webmvc.json.PersistentEntityJackson2Module does not properly handle JPA @Transient annotation during serialization yeilding a NPE
+    * [DATAREST-261] - RepositoryRelProvider is not registered
+    * [DATAREST-265] - POST/Create with Non-CRUD Repository doesn't save (only checks exists())
+    * [DATAREST-267] - (Potentially) unwanted behaviour for self hrefs with projections
+    * [DATAREST-268] - Exception when putting element with return type
+    * [DATAREST-271] - PaginationCustomizations are not applied
+
+** Improvement
+    * [DATAREST-155] - Allow overriding which field gets exposed in the URI
+    * [DATAREST-262] - Support nested association creation for updating operations
+    * [DATAREST-277] - Adapt changes in BeanWrapper API
+    * [DATAREST-278] - Add converters to bind new geo-types from request parameters
+    * [DATAREST-279] - Add marshalling support for newly introduced geo types
+    * [DATAREST-280] - Let configuration lookup MappingContexts less aggressively
+    * [DATAREST-281] - Upgrade to Spring Data Gemfire 1.4.x branch
+
+** New Feature
+    * [DATAREST-221] - Support use case-driven inlining of managed resources
+
+** Task
+    * [DATAREST-257] - Release 2.1 M1
+
+Changes in version 2.0.1.RELEASE (2014-03-13)
+---------------------------------------------
+** Bug
+    * [DATAREST-150] - PUT vs PATCH with JPA
+    * [DATAREST-247] - NPE when calling count Queries in SD MongoDB Repositories
+    * [DATAREST-253] - AssociationOmittingSerializerModifier suffers from potential NullPointerException
+    * [DATAREST-254] - org.springframework.data.rest.webmvc.json.PersistentEntityJackson2Module does not properly handle JPA @Transient annotation during serialization yeilding a NPE
+    * [DATAREST-261] - RepositoryRelProvider is not registered
+    * [DATAREST-267] - (Potentially) unwanted behaviour for self hrefs with projections
+    * [DATAREST-268] - Exception when putting element with return type
+    * [DATAREST-271] - PaginationCustomizations are not applied
+
+** Task
+    * [DATAREST-258] - Release 2.0.1
+
 Changes in version 2.0.0.RELEASE (2014-02-24)
 ---------------------------------------------
 ** Bug
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index c61fc5ba7..f300a5220 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data REST 2.0 RELEASE
+Spring Data REST 2.1.0.M1
 Copyright (c) 2012-2014 Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0