From a5e7aebb654d9bf09ff09e6ed8c51312876a5f97 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Mon, 3 Feb 2014 14:34:01 +0100
Subject: [PATCH] DATAREST-226 - After release cleanups.

Upgraded to Spring Data snapshot dependencies. Added missing changelog entries.
---
 pom.xml                          | 14 +++++++-------
 src/main/resources/changelog.txt | 33 ++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index c6c58a64e..94b933efa 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.3.0.RC1</version>
+		<version>1.3.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
@@ -27,10 +27,10 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-rest</dist.id>
 
-		<springdata.commons>1.7.0.RC1</springdata.commons>
-		<springdata.jpa>1.5.0.RC1</springdata.jpa>
-		<springdata.mongodb>1.4.0.RC1</springdata.mongodb>
-		<springdata.neo4j>3.0.0.RC1</springdata.neo4j>
+		<springdata.commons>1.7.0.BUILD-SNAPSHOT</springdata.commons>
+		<springdata.jpa>1.5.0.BUILD-SNAPSHOT</springdata.jpa>
+		<springdata.mongodb>1.4.0.BUILD-SNAPSHOT</springdata.mongodb>
+		<springdata.neo4j>3.0.0.BUILD-SNAPSHOT</springdata.neo4j>
 		<springdata.gemfire>1.3.3.RELEASE</springdata.gemfire>
 
 		<hibernate.version>4.2.0.Final</hibernate.version>
@@ -127,8 +127,8 @@
 
 	<repositories>
 		<repository>
-			<id>spring-libs-milestone</id>
-			<url>http://repo.spring.io/libs-milestone</url>
+			<id>spring-libs-snapshot</id>
+			<url>http://repo.spring.io/libs-snapshot</url>
 		</repository>
 	</repositories>
 	
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index a4520ddde..b640cf4d7 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,35 @@
+Spring Data REST Changelog
+==========================
 
-Release Notes - Spring Data REST - Version 2.0 M1
--------------------------------------------------
+Changes in version 2.0.0.RC1 (2014-01-29)
+-----------------------------------------
+** Bug
+    * [DATAREST-107] - @RestResource exported=false ignored on methods
+    * [DATAREST-130] - Updating value to NULL using Spring Data REST and PUT Method
+    * [DATAREST-188] - Spring data rest wrongly handles jpa collection attributes
+    * [DATAREST-195] - Limiting page size
+    * [DATAREST-198] - NullPointerException when accessing OneToMany Relationship
+    * [DATAREST-199] - Collection/Object conversion broken in PersistentEntityJackson2Module
+    * [DATAREST-200] - Embedded associations do not get rendered
+    * [DATAREST-209] - Hard Dependency on Jackson-Hibernate
+    * [DATAREST-210] - ApplicationContext fails to load with HAL enabled snapshot
+    * [DATAREST-213] - Make old presentation available for smooth migration to HAL
+    * [DATAREST-222] - Path.matches(…) should escape reference before trying to match it
+
+** Improvement
+    * [DATAREST-75] - PersistentEntityJackson2Module should be more lenient regarding other registered modules
+    * [DATAREST-203] - Move to HAL as default hypermedia format
+    * [DATAREST-219] - Improve handling of updates to related collection properties
+    * [DATAREST-229] - RepositoryEntityLinks should exposed templated link for pageable collection resources
+    * [DATAREST-233] - Improve annotation based customization 
+
+** Task
+    * [DATAREST-220] - Add contribution guidelines
+    * [DATAREST-224] - Switch to Maven build system
+    * [DATAREST-226] - Release Spring Data REST 2.0.0.RC1
+
+Changes in version 2.0.0 M1 (2013-11-21)
+----------------------------------------
 ** Bug
     * [DATAREST-72] - @RestResource(exported = false) is not considered on repository interfaces
     * [DATAREST-83] - Controller implementations should not be annotated with @Controller